rpms/glabels/F-7 .cvsignore, 1.3, 1.4 glabels.spec, 1.8, 1.9 sources, 1.3, 1.4
Peter Gordon (pgordon)
fedora-extras-commits at redhat.com
Tue Jan 15 07:30:01 UTC 2008
Author: pgordon
Update of /cvs/pkgs/rpms/glabels/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19225/F-7
Modified Files:
.cvsignore glabels.spec sources
Log Message:
Update to 2.2.0 Final
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 7 Jan 2006 21:48:37 -0000 1.3
+++ .cvsignore 15 Jan 2008 07:29:23 -0000 1.4
@@ -1 +1 @@
-glabels-2.0.4.tar.gz
+glabels-2.2.0.tar.gz
Index: glabels.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-7/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 15 Jan 2008 07:29:23 -0000 1.9
@@ -1,30 +1,37 @@
-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.2.0
+Release: 1%{?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: evolution-data-server-devel >= 1.8
+BuildRequires: gettext
+BuildRequires: gtk2 >= 2.10
+BuildRequires: libglade2-devel >= 2.6
+BuildRequires: libgnomeui-devel >= 2.16
+BuildRequires: libxml2 >= 2.6
+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
business cards for the GNOME desktop environment.
@@ -32,75 +39,131 @@
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
+%configure --disable-update-mimedb --disable-update-desktopdb
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}
+make install DESTDIR=%{buildroot}
+desktop-file-install \
+ --vendor=fedora \
+ --dir %{buildroot}%{_datadir}/applications \
+ --delete-original \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
+## Fix encodings.
+for DOC_FILE in AUTHORS ChangeLog NEWS; do
+ %{_bindir}/iconv -f iso8859-1 -t utf-8 ${DOC_FILE} > ${DOC_FILE}.conv;
+ mv -f ${DOC_FILE}.conv ${DOC_FILE};
+done
+## Remove useless ScrollKeeper cruft. The %%post/%%postun scriptlets handle
+## the updating for us instead.
+rm -rf %{buildroot}%{_localstatedir}/scrollkeeper
+
%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 COPYING.README_FIRST 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
+%doc %{_datadir}/gtk-doc/html/libglabels
+%exclude %{_libdir}/libglabels.la
+%exclude %{_libdir}/libglabels.a
%{_includedir}/libglabels/
-%{_libdir}/libglabels.a
%{_libdir}/libglabels.so
-%exclude %{_libdir}/libglabels.la
+%{_libdir}/pkgconfig/libglabels.pc
+
+%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
+%doc %{_datadir}/gnome/help/glabels/
+%{_datadir}/omf/glabels/
+%{_mandir}/man?/glabels.*
+
%changelog
+* Mon Jan 14 2008 Peter Gordon <peter at thecodergeek.com> - 2.2.0-1
+- Update to new upstream release (2.2.0 Final); Yay!
+
* Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 2.0.5-5
- Add BR: perl(XML::Parser)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 7 Jan 2006 21:48:37 -0000 1.3
+++ sources 15 Jan 2008 07:29:23 -0000 1.4
@@ -1 +1 @@
-76a6f1f8055f75ab4204fdca79627006 glabels-2.0.4.tar.gz
+aad7dceaeeb8f376570421a76fa1f225 glabels-2.2.0.tar.gz
More information about the fedora-extras-commits
mailing list