glabels.spec.in: Updated by merging with Dag Wieers's <dag@wieers.com> glabels.spec...

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@320 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index dd44c17a082cea60d1d985a15605eb1f0777a2df..40f8034f4079a2efbce78a3674f6977c7b3d9f0b 100644 (file)
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -39,8 +39,6 @@ Glabels includes contributions from:
                                                       that first appeared in
                                                       0.4.3:
        Alessandro Zummo <azummo@towertech.it>
-       David L Norris <dave@webaugur.com>
-       James Ogley <james.ogley@pinnacle.co.uk>
        Dag Wieers <dag@wieers.com>
 
 Translations:

diff --git a/glabels2/glabels.spec.in b/glabels2/glabels.spec.in
index 9ff85051164a5311ab928fc4a3dff72ee403b4ae..c3cea549ae0f61ba48989b5ccc230b0bbf293b50 100644 (file)
--- a/glabels2/glabels.spec.in
+++ b/glabels2/glabels.spec.in
@@ -1,24 +1,20 @@
-%define name   @PACKAGE@
-%define ver    @VERSION@
-%define RELEASE        1
-%define rel    %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
-%define prefix /usr
-%define sysconfdir /etc
-
 Summary: glabels is a GNOME program to create labels and business cards
-Name:      %name
-Version:   %ver
-Release:   %rel
+Name:      glabels
+Version:   @VERSION@
+Release:   1
 Copyright: GPL
-Group: Applications/Graphics
-Source: glabels-%{ver}.tar.gz
+Group: Applications/Publishing
 URL: http://snaught.com/glabels/
-BuildRoot: /var/tmp/glabels-%{PACKAGE_VERSION}-root
 
-Requires: gtk+ >= 1.3
-Requires: gnome-libs >= 1.108
-Requires: gnome-print >= 1.109
-Requires: gdk-pixbuf >= 1.3
+Source: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/root-%{name}-%{version}
+Prefix: %{_prefix}
+
+BuildRequires: gtk+-devel >= 1.2
+BuildRequires: libgnomeui-devel >= 2.0
+BuildRequires: libgnomecanvas-devel >= 2.0
+BuildRequires: libgnomeprint22-devel >= 2.2
+BuildRequires: libxml2-devel >= 2.4
 
 %description
 gLabels is a lightweight program for creating labels and
@@ -27,31 +23,42 @@ It is designed to work with various laser/ink-jet peel-off
 label and business card sheets that you'll find at most office
 supply stores.
 
-
 %prep
 %setup
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure --prefix=%{prefix} 
-make
+%configure
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+%makeinstall
+%find_lang %{name}
 
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+desktop-file-install --vendor gnome                \
+       --add-category X-Red-Hat-Base              \
+       --dir %{buildroot}%{_datadir}/applications \
+       %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 %doc README COPYING ChangeLog NEWS AUTHORS INSTALL
-%{prefix}/bin/glabels
-%{prefix}/bin/glabels-batch
-%{prefix}/share/*
+%doc %{_datadir}/gnome/help/glabels/
+%{_bindir}/*
+%{_datadir}/glabels/
+%{_datadir}/pixmaps/*
+%{_datadir}/applications/*.desktop
+%{_datadir}/application-registry/*
+%{_datadir}/mime-info/*
 
 
 %changelog
+* Sat Oct 18 2002 Jim Evins <evins@snaught.com>
+- Updated, based largely on Dag Wieers <dag@wieers.com> glabels.spec
+
 * Sat May 19 2001 Jim Evins <evins@snaught.com>
 - Created