[glabels/f15] Update to new upstream release (3.0.0). Adds glabels-templates subpackage (MIT/X11 license). Updates
Peter Gordon
pgordon at fedoraproject.org
Fri Jun 10 00:17:15 UTC 2011
commit 4f3f83d29ce502269ba64a4583246c2c39e70ee7
Author: Peter Gordon <peter at thecodergeek.com>
Date: Thu Jun 9 17:17:04 2011 -0700
Update to new upstream release (3.0.0). Adds glabels-templates subpackage (MIT/X11 license). Updates license from (L)GPLv2+ to (L)GPLv3+. Remove libxml-XML_PARSE_HUGE patch.
.gitignore | 1 +
glabels-libxml-XML_PARSE_HUGE.patch | 21 ----
glabels.spec | 180 +++++++++++++++++++----------------
sources | 2 +-
4 files changed, 101 insertions(+), 103 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94f087d..2260cae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
glabels-2.2.8.tar.bz2
+/glabels-3.0.0.tar.bz2
diff --git a/glabels.spec b/glabels.spec
index ec89e40..de8f3fe 100644
--- a/glabels.spec
+++ b/glabels.spec
@@ -1,42 +1,34 @@
Name: glabels
-Version: 2.2.8
-Release: 4%{?dist}
+Version: 3.0.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
+License: GPLv3+
+URL: http://www.glabels.org
-Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
-
-Patch0: %{name}-libxml-XML_PARSE_HUGE.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://ftp.gnome.org/pub/GNOME/sources/glabels/3.0/glabels-%{version}.tar.bz2
+BuildRequires: barcode-devel
BuildRequires: desktop-file-utils
+BuildRequires: evolution-data-server-devel
+BuildRequires: gettext
BuildRequires: gnome-doc-utils
BuildRequires: gnome-doc-utils-stylesheets
-BuildRequires: evolution-data-server-devel >= 1.8
-BuildRequires: gettext
-BuildRequires: gtk2 >= 2.10
+BuildRequires: gtk3-devel
+BuildRequires: iec16022-devel
BuildRequires: intltool
-BuildRequires: libglade2-devel >= 2.6
-BuildRequires: libgnomeui-devel >= 2.16
BuildRequires: libxml2 >= 2.6
+BuildRequires: librsvg2-devel
+BuildRequires: libtool
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
+BuildRequires: qrencode-devel
+BuildRequires: zint-devel
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-doc = %{version}-%{release}
-
+Requires: %{name}-templates = %{version}-%{release}
+
%description
gLabels is a lightweight program for creating labels and
business cards for the GNOME desktop environment.
@@ -47,7 +39,7 @@ supply stores.
%package devel
Summary: Development files and documentation for %{name}
-License: LGPLv2+
+License: LGPLv3+
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
@@ -56,8 +48,17 @@ This package contains the header files and development documentation for
libglabels.
+%package doc
+License: GFDL
+Summary: Runtime documentation for %{name}
+Group: Development/Libraries
+
+%description doc
+This package contains the runtime documentation and manual pages for %{name}.
+
+
%package libs
-License: LGPLv2+
+License: LGPLv3+
Summary: Development files and documentation for %{name}
Group: Development/Libraries
@@ -65,41 +66,35 @@ Group: Development/Libraries
This package contains the shared libraries for %{name}.
-%package doc
-License: GFDL
-Summary: Runtime documentation for %{name}
+%package templates
+License: MIT
+Summary: The %{name} template database
Group: Development/Libraries
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
+## Needs the glabels-libs subpackage for proper ownership of the top-level
+## libglabels-3.0 directory in %%_datadir.
+Requires: %{name}-libs
-%description doc
-This package contains the runtime documentation and manual pages for %{name}.
+%description templates
+This package contains the template database for %{name}.
%prep
%setup -q
-#%patch0 -p1 -b .libxml-XML_PARSE_HUGE
%build
-%configure --disable-update-mimedb --disable-update-desktopdb LIBS=-lm
-make %{?_smp_mflags}
+%configure --enable-gtk-doc
+make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
%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
+ %{buildroot}%{_datadir}/applications/glabels-3.0.desktop
+%find_lang glabels-3.0
%post
@@ -109,6 +104,9 @@ update-mime-database %{_datadir}/mime &> /dev/null ||:
%postun
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null ||:
+if [ $1 -eq 0 ]; then
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
+fi
%post libs -p /sbin/ldconfig
@@ -116,54 +114,74 @@ update-mime-database %{_datadir}/mime &> /dev/null ||:
%postun libs -p /sbin/ldconfig
-%post doc
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
-
-%postun doc
-scrollkeeper-update -q ||:
-
-
-%clean
-rm -rf %{buildroot}
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
-%files -f %{name}.lang
-%defattr(-,root,root,-)
+%files -f glabels-3.0.lang
%doc AUTHORS ChangeLog COPYING COPYING.README_FIRST NEWS README TODO
-%{_bindir}/glabels*
-%{_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
+%{_bindir}/glabels-3*
+%{_datadir}/applications/fedora-glabels-3.0.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.glabels-3.gschema.xml
+%{_datadir}/icons/hicolor/*/apps/glabels-3.0.png
+%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-glabels.png
+%{_datadir}/mime/packages/glabels-3.0.xml
%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.so
-%{_libdir}/pkgconfig/libglabels.pc
-
-%files libs
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING-LIBGLABELS
-%{_libdir}/libglabels.so.*
+%doc AUTHORS COPYING-LIBS
+%doc %{_datadir}/gtk-doc/html/libglabels-3.0/
+%{_includedir}/libglabels-3.0/
+%{_includedir}/libglbarcode-3.0/
+%{_libdir}/libglabels-3.0.so
+%{_libdir}/libglbarcode-3.0.so
+%{_libdir}/pkgconfig/libglabels-3.0.pc
+%{_libdir}/pkgconfig/libglbarcode-3.0.pc
%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.*
+%doc %{_datadir}/gnome/help/glabels-3.0/
+%{_mandir}/man?/glabels-3*
+%{_datadir}/gtk-doc/html/libglabels-3.0/
+%{_datadir}/gtk-doc/html/libglbarcode-3.0/
+
+%files libs
+%doc AUTHORS COPYING-LIBS
+%dir %{_datadir}/libglabels-3.0/
+%exclude %{_libdir}/*.a
+%exclude %{_libdir}/*.la
+%{_datadir}/glabels-3.0/
+%{_libdir}/libglabels-3.0.so.*
+%{_libdir}/libglbarcode-3.0.so.*
+
+%files templates
+%doc AUTHORS COPYING-TEMPLATES
+%{_datadir}/libglabels-3.0/dtd/
+%{_datadir}/libglabels-3.0/templates/
%changelog
+* Thu Jun 09 2011 Peter Gordon <peter at thecodergeek.com> - 3.0.0-1
+- Update to new upstream development release (3.0.0).
+ * Ported to GTK+ 3 and gsettings.
+ * Documentation ported to Mallard.
+ * Adds native SVG support.
+ * Vastly reworked and improved barcode handling.
+ * Updated logo and theme-friendly icons.
+ * Adds many new templates and updated translations.
+ * Undo/Redo capability (from 2.3.0).
+ * Updated license from GPLv2+ to GPLv3+ (from 2.3.0).
+ * Lots of UI enhancements (from 2.3.0).
+- Add glabels-templates subpackage (MIT/X11 License).
+- Remove %%defattr lines in %%files listings, and fix scriptlets and buildroot
+ usage in accordance with updated packaging guidelines.
+- Update Source0 and homepage URLs.
+- Remove fix for encodings (now UTF-8 from upstream).
+- Other minor (aesthetic) spec fixes.
+- Resolves: #706635 (New upstream version available).
+- Remove XML_PARSE_HUGE patch (thanks to Maxim Burgerhout)
+- Resolves: #676839 (obsolete patch in srpm).
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -198,7 +216,7 @@ rm -rf %{buildroot}
* Fixed default preview colors in color combos.
* Updated german translation.
* New templates.
-
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/sources b/sources
index 3cc0f44..8984579 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e0ac4b19de68d55e33aef6a5544f0e5 glabels-2.2.8.tar.bz2
+823531d597a5483c30486f1b22ee07bf glabels-3.0.0.tar.bz2
More information about the scm-commits
mailing list