adjust to new _libexecdir

[packages/gamin.git] / gamin.spec

diff --git a/gamin.spec b/gamin.spec
index 5ade24ae78c175598c10a7a33e3240ab96eda61a..324fbca5a68dc7a60052ed0921b07972ad97f188 100644 (file)
--- a/gamin.spec
+++ b/gamin.spec
@@ -1,24 +1,31 @@
 Summary:       Library providing the gamin File Alteration Monitor API
 Summary(pl.UTF-8):     Biblioteka dostarczająca File Alteration Monitor API gamina
 Name:          gamin
-Version:       0.1.9
-Release:       1
-License:       LGPL
-Group:         Networking/Daemons
+Version:       0.1.10
+Release:       7
+License:       LGPL v2.1
+Group:         Libraries
 Source0:       http://www.gnome.org/~veillard/gamin/sources/%{name}-%{version}.tar.gz
-# Source0-md5: 2d3a6a70df090ed923238e381e6c2982
-Patch0:                %{name}-inotify.patch
+# Source0-md5: b4ec549e57da470c04edd5ec2876a028
+Patch0:                %{name}-glib.patch
+Patch1:                double-lock.patch
 URL:           http://www.gnome.org/~veillard/gamin/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: glib2-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: python
 BuildRequires: python-devel
-Requires:      %{name}-libs = %{version}-%{release}
+BuildRequires: python-modules
+BuildRequires: rpm-pythonprov
+Provides:      fam
+Provides:      fam-libs
+Obsoletes:     fam
+Obsoletes:     fam-common
+Obsoletes:     fam-inetd
+Obsoletes:     fam-libs
+Obsoletes:     fam-standalone
 Obsoletes:     gamin-inetd
-Provides:      fam = %{name}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,25 +38,26 @@ Ta biblioteka C dostarcza mechanizm monitorowania zmian plików
 kompatybilny na poziomie API i ABI z gaminem, ale niezależny od
 ogólnosystemowego demona.
 
-%package libs
-Summary:       Libraries for gamin
-Summary(pl.UTF-8):     Biblioteki dla gamina
-Group:         Libraries
-Provides:      fam-libs = %{name}-libs
+%package docs
+Summary:       Documentation for gamin
+Summary(pl.UTF-8):     Dokumentacja dla gamina
+Group:         Documentation
+Requires:      %{name} = %{version}-%{release}
 
-%description libs
-Libraries for gamin.
+%description docs
+Documentation for gamin.
 
-%description libs -l pl.UTF-8
-Biblioteki dla gamina.
+%description docs -l pl.UTF-8
+Dokumentacja dla gamina.
 
 %package devel
 Summary:       Includes to develop using gamin
 Summary(pl.UTF-8):     Pliki nagłówkowe do tworzenia programów z użyciem gamina
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      glib2-devel
-Provides:      fam-devel = %{name}-devel
+Provides:      fam-devel
+Obsoletes:     fam-devel
 
 %description devel
 Includes to develop using gamin.
@@ -62,7 +70,8 @@ Summary:      gamin static libraries
 Summary(pl.UTF-8):     Statyczne biblioteki gamina
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
-Provides:      fam-static = %{name}-static
+Provides:      fam-static
+Obsoletes:     fam-static
 
 %description static
 gamin static libraries.
@@ -86,6 +95,7 @@ Moduły języka Python dla gamina.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -95,14 +105,20 @@ Moduły języka Python dla gamina.
 %{__automake}
 %configure \
        --%{?debug:en}%{!?debug:dis}able-debug
-%{__make}
+
+%{__make} \
+       CFLAGS="%{rpmcflags} -D_GNU_SOURCE"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+rm -rf html
+install -d html
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+cp -a doc/*.{html,gif} html
+
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 
@@ -111,30 +127,37 @@ rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{py,la,a}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  libs -p /sbin/ldconfig
-%postun        libs -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_libdir}/gam_server
+%attr(755,root,root) %{_libexecdir}/gam_server
+%attr(755,root,root) %{_libdir}/libfam.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfam.so.0
+%attr(755,root,root) %{_libdir}/libgamin-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgamin-1.so.0
 
-%files libs
+%files docs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc AUTHORS ChangeLog README TODO html doc/*.txt
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*.h
-%{_pkgconfigdir}/*.pc
+%attr(755,root,root) %{_libdir}/libfam.so
+%attr(755,root,root) %{_libdir}/libgamin-1.so
+%{_libdir}/libfam.la
+%{_libdir}/libgamin-1.la
+%{_includedir}/fam.h
+%{_pkgconfigdir}/gamin.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libfam.a
+%{_libdir}/libgamin-1.a
+%{_libdir}/libgamin_shared.a
 
 %files -n python-gamin
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/*.so
+%attr(755,root,root) %{py_sitedir}/_gamin.so
 %{py_sitedir}/*.py[co]