- updated to 1.3 (note: new soname); project has been moved to github

- removed outdated am18 patch, dotconf.m4 is gone

Changed files:
    dotconf-am18.patch -> 1.2
    dotconf.spec -> 1.5

diff --git a/dotconf-am18.patch b/dotconf-am18.patch
deleted file mode 100644 (file)
index b798c52..0000000
--- a/dotconf-am18.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dotconf-1.0.13/dotconf.m4.orig     2002-09-17 20:08:08.000000000 +0200
-+++ dotconf-1.0.13/dotconf.m4  2008-01-12 14:08:20.751042191 +0100
-@@ -2,7 +2,7 @@
- dnl ## AM_PATH_DOTCONF([MINIMUM_VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT_FOUND]]])
- dnl ##
- dnl ##
--AC_DEFUN(AM_PATH_DOTCONF,
-+AC_DEFUN([AM_PATH_DOTCONF],
- [dnl
- dnl Get the cflags and libs from the dotconf-config script
- dnl

diff --git a/dotconf.spec b/dotconf.spec
index 89dec0cef9fa30afd4646307a8cc7a94004ead9d..e4e7843e4199cf446388808a80b858fc17b1622f 100644 (file)
--- a/dotconf.spec
+++ b/dotconf.spec
@@ -1,17 +1,16 @@
 Summary:       Configuration file parser library
 Summary(pl.UTF-8):     Biblioteka analizująca pliki konfiguracyjne
 Name:          dotconf
-Version:       1.0.13
+Version:       1.3
 Release:       1
 License:       LGPL v2.1
 Group:         Libraries
-Source0:       http://www.azzit.de/dotconf/download/v1.0/%{name}-%{version}.tar.gz
-# Source0-md5: bbf981a5f4a64e94cc6f2a693f96c21a
-Patch0:                %{name}-am18.patch
+Source0:       https://github.com/williamh/dotconf/tarball/v%{version}#/%{name}-%{version}.tar.gz
+# Source0-md5: 36bfdde245072fc2f4f5766b7db97c45
 URL:           http://www.azzit.de/dotconf/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.63
 BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,8 +60,7 @@ Static dot.conf library.
 Statyczna biblioteka dot.conf.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n williamh-dotconf-4cd7b3a
 
 %build
 %{__libtoolize}
@@ -79,6 +77,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_examplesdir}
+mv $RPM_BUILD_ROOT%{_docdir}/dotconf/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/dotconf/dotconf*.txt
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,20 +90,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README doc/*.txt examples
-%attr(755,root,root) %{_libdir}/libdotconf-*.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdotconf-1.0.so.0
+%doc AUTHORS README
+%attr(755,root,root) %{_libdir}/libdotconf.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdotconf.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/dotconf-config
+%doc doc/dotconf*.txt
 %attr(755,root,root) %{_libdir}/libdotconf.so
 %{_libdir}/libdotconf.la
-%{_libdir}/libpool.a
 %{_includedir}/dotconf.h
-%{_includedir}/libpool.h
-%{_aclocaldir}/dotconf.m4
 %{_pkgconfigdir}/dotconf.pc
+%{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)