rpms/evince/devel evince.spec,1.160,1.161

Peter Robinson pbrobinson at fedoraproject.org
Fri May 1 11:28:17 UTC 2009


Author: pbrobinson

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23992

Modified Files:
	evince.spec 
Log Message:
- Split libs out to a subpackage - RHBZ 480729


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- evince.spec	17 Mar 2009 02:45:09 -0000	1.160
+++ evince.spec	1 May 2009 11:27:45 -0000	1.161
@@ -6,7 +6,7 @@
 
 Name:		evince
 Version:	2.26.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
@@ -51,6 +51,7 @@ Requires(post): GConf2
 Requires(post): scrollkeeper
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
 Evince is simple multi-page document viewer. It can display and print
@@ -63,10 +64,18 @@ Support for other document formats such 
 installing additional backends.
 
 
+%package libs
+Summary: Libraries for the evince document viewer
+Group: System Environment/Libraries
+
+%description libs
+This package contains shared libraries needed for evince 
+
+
 %package devel
 Summary: Support for developing backends for the evince document viewer
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
 This package contains libraries and header files needed for evince
@@ -76,7 +85,7 @@ backend development.
 %package dvi
 Summary: Evince backend for dvi files
 Group: Applications/Publishing
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description dvi
 This package contains a backend to let evince display dvi files.
@@ -85,7 +94,7 @@ This package contains a backend to let e
 %package djvu
 Summary: Evince backend for djvu files
 Group: Applications/Publishing
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description djvu
 This package contains a backend to let evince display djvu files.
@@ -127,9 +136,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # don't ship icon caches
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
-# we don't have a -devel package, so we don't need backend api docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -175,6 +181,9 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
   /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
 fi
 
+%post libs
+/sbin/ldconfig
+
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -190,7 +199,6 @@ fi
 
 
 %postun
-/sbin/ldconfig
 update-desktop-database &> /dev/null ||:
 scrollkeeper-update -q || :
 
@@ -199,6 +207,8 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
   /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
 fi
 
+%postun libs
+/sbin/ldconfig
 
 %files -f evince.lang
 %defattr(-,root,root,-)
@@ -210,6 +220,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/icons/hicolor/*/apps/evince.*
 %{_mandir}/man1/evince.1.gz
+
+%files libs
+%defattr(-,root,root,-)
 %{_libdir}/libevview.so.*
 %{_libdir}/libevdocument.so.*
 %dir %{_libdir}/evince
@@ -224,8 +237,11 @@ fi
 %{_libdir}/evince/1/backends/libcomicsdocument.so
 %{_libdir}/evince/1/backends/comicsdocument.evince-backend
 
-
 %files devel
+%defattr(-,root,root,-)
+%{_datadir}/gtk-doc/html/evince/
+%{_datadir}/gtk-doc/html/libevdocument/
+%{_datadir}/gtk-doc/html/libevview/
 %{_includedir}/evince/2.25
 %{_libdir}/libevview.so
 %{_libdir}/libevdocument.so
@@ -233,14 +249,19 @@ fi
 %{_libdir}/pkgconfig/evince-document-2.25.pc
 
 %files dvi
+%defattr(-,root,root,-)
 %{_libdir}/evince/1/backends/libdvidocument.so*
 %{_libdir}/evince/1/backends/dvidocument.evince-backend
 
 %files djvu
+%defattr(-,root,root,-)
 %{_libdir}/evince/1/backends/libdjvudocument.so
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Fri May 01 2009 Peter Robinson <pbrobinson at gmail.com> - 2.26.0-2
+- Split libs out to a subpackage - RHBZ 480729
+
 * Mon Mar 16 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0
 




More information about the fedora-extras-commits mailing list