rpms/glabels/devel glabels.spec,1.8,1.9

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/glabels/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31994/glabels/devel

Modified Files:
	glabels.spec 
Log Message:
Update license tag, among a myriad of aesthetic changes. This splits the package into additional glabels-doc and glabels-libs subpackages.


Index: glabels.spec
===================================================================
RCS file: /cvs/extras/rpms/glabels/devel/glabels.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- glabels.spec	27 Aug 2006 23:11:27 -0000	1.8
+++ glabels.spec	3 Aug 2007 10:36:14 -0000	1.9
@@ -1,29 +1,35 @@
-Name: glabels
-Version: 2.0.4
-Release: 5%{?dist}
-Summary: A program for creating labels and business cards for GNOME
-
-Group: Applications/Publishing
-License: GPL
-URL: http://glabels.sf.net
-Source0: http://dl.sf.net/glabels/glabels-2.0.4.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1
-BuildRequires: libgnomeprintui22-devel
-BuildRequires: desktop-file-utils, scrollkeeper
-BuildRequires: gettext
-BuildRequires: perl(XML::Parser)
-
-Requires(post): /sbin/ldconfig
-Requires(post): scrollkeeper
-Requires(post): shared-mime-info
-Requires(post): desktop-file-utils
-
-Requires(postun): /sbin/ldconfig
-Requires(postun): scrollkeeper
-Requires(postun): shared-mime-info
-Requires(postun): desktop-file-utils
+Name:		glabels
+Version:	2.0.4
+Release:	6%{?dist}
+Summary:	A program for creating labels and business cards for GNOME
+
+Group:		Applications/Publishing
+License:	GPLv2+
+URL:		http://glabels.sf.net
+
+Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	libglade2-devel >= 2.0.1
+BuildRequires:	libgnomeprintui22-devel
+BuildRequires:	libgnomeui-devel >= 2.0 
+BuildRequires:	perl(XML::Parser)
+BuildRequires:	scrollkeeper
+
+Requires(post):	desktop-file-utils
+Requires(post):	/sbin/ldconfig
+Requires(post):	shared-mime-info
+
+Requires(postun):	desktop-file-utils
+Requires(postun):	/sbin/ldconfig
+Requires(postun):	shared-mime-info
+
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-doc = %{version}-%{release}
+	
 
 %description
 gLabels is a lightweight program for creating labels and
@@ -32,76 +38,137 @@
 label and business card sheets that you'll find at most office
 supply stores.
 
-%package devel
-Summary: Development files and documentation for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-This package contains the header files, static libraries and development
-documentation for %{name}. 
+
+%package	devel
+Summary:	Development files and documentation for %{name}
+License:	LGPLv2+
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description	devel
+This package contains the header files and development documentation for
+libglabels. 
+
+
+%package 	libs
+License:	LGPLv2+
+Summary:	Development files and documentation for %{name}
+Group:		Development/Libraries
+
+%description	libs
+This package contains the shared libraries for %{name}. 
+
+
+%package 	doc
+License:	GFDLv1.1+
+Summary:	Runtime documentation for %{name}
+Group:		Development/Libraries
+Requires(post):	scrollkeeper
+Requires(postun):	scrollkeeper
+
+%description	doc
+This package contains the runtime documentation and manual pages for %{name}. 
+
+
 %prep
-%setup
+%setup -q
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT \
-  UPDATE_DESKTOP_DATABASE="true" UPDATE_MIME_DATABASE="true"
-desktop-file-install \
-  --vendor=fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+%install
+rm -rf %{buildroot}
+## UPDATE_DESKTOP_DATABASE and UPDATE_MIME_DATABASE are set to /bin/true
+## to prevent them from being run as part of the build scripts (which fail
+## when installing to rooted filesystem). These are handled through the %%post
+## and %%postun scriptlets, instead.
+make install DESTDIR=%{buildroot}		\
+	UPDATE_DESKTOP_DATABASE=/bin/true	\
+	UPDATE_MIME_DATABASE=/bin/true
+desktop-file-install					\
+	--vendor=fedora					\
+	--dir %{buildroot}%{_datadir}/applications	\
+	--delete-original				\
+	%{buildroot}%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
 
+
 %post
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 update-desktop-database &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null || :
-/sbin/ldconfig
+update-mime-database %{_datadir}/mime &> /dev/null ||:
 
 %postun
-scrollkeeper-update -q || :
 update-desktop-database &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null || :
-/sbin/ldconfig
+update-mime-database %{_datadir}/mime &> /dev/null ||:
+
+
+%post	libs -p /sbin/ldconfig
+
+%postun	libs -p /sbin/ldconfig
+
+
+%post	doc
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
+
+%postun	doc
+scrollkeeper-update -q ||:
+
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files -f %{name}.lang
-%defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%doc %{_datadir}/gnome/help/glabels/
-%doc %{_mandir}/man1/glabels.1*
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/glabels*
-%{_libdir}/libglabels.so.*
 %{_datadir}/application-registry/glabels.applications
 %{_datadir}/applications/fedora-glabels.desktop
 %{_datadir}/glabels/
 %{_datadir}/mime/packages/glabels.xml
 %{_datadir}/mime-info/glabels.*
 %{_datadir}/pixmaps/glabels/
-%{_datadir}/pixmaps/glabels.png
-%{_datadir}/pixmaps/glabels-application-x-glabels.png
-%{_datadir}/omf/glabels/
+%{_datadir}/pixmaps/glabels*.png
 
-%files devel
-%defattr(-, root, root, 0755)
+%files	devel
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING.LIBGLABELS
+%exclude %{_libdir}/libglabels.la
+%exclude %{_libdir}/libglabels.a
 %{_includedir}/libglabels/
-%{_libdir}/libglabels.a
 %{_libdir}/libglabels.so
-%exclude %{_libdir}/libglabels.la
+
+%files	libs
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING.LIBGLABELS
+%{_libdir}/libglabels.so.*
+
+%files	doc
+%defattr(-,root,root,-)
+## Manual ("man") pages are automatically marked as %%doc by RPM. 
+%doc AUTHORS COPYING-DOCS
+%{_datadir}/gnome/help/glabels/
+%{_datadir}/omf/glabels/
+%{_mandir}/man?/glabels.*
+
+
 
 %changelog
-* Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 2.0.5-5
+* Fri Aug 03 2007 Peter Gordon <peter at thecodergeek.com> - 2.0.4-6
+- Update License tagging (GPLv2+). This necessitates a split of two
+  subpackages:
+  (1) glabels-doc: Runtime documentation for gLabels (GFDLv1.1+)
+  (2) glabels-libs: Shared libraries for gLabels (LGPLv2+)
+- Fix version in previous %%changelog entry.
+- Lots and lots of aesthetic spec file changes.
+- Remove X-Fedora category from desktop-file-install invocation.
+- Add TODO to installed %%doc files. 
+
+* Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 2.0.4-5
 - Add BR: perl(XML::Parser)
  
 * Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 2.0.4-4