- updated to 1.92.0

- removed outdated libgnomeprint_fix and paths patches
- added DESTDIR patch
- simplified %%files

Changed files:
    glabels.spec -> 1.6

diff --git a/glabels.spec b/glabels.spec
index edbbda79da9a5fb2729043514069caf4a504cccd..1335f4c40d24c5a2fe105d6f315c47d8c7a254a8 100644 (file)
--- a/glabels.spec
+++ b/glabels.spec
@@ -1,26 +1,24 @@
 Summary:       gLabels - a GNOME2 program to create labels and business cards
 Summary(pl):   gLabels - program dla GNOME2 do tworzenia etykiet i wizytówek
 Name:          glabels
-Version:       1.91.1
-Release:       2
+Version:       1.92.0
+Release:       1
 License:       GPL
 Group:         Applications/Graphics
-Source0:       http://snaught.com/glabels/source/%{name}-%{version}.tar.gz
-# Source0-md5: bd5bfd26c9e8c8f7741e255264ce2377
-Patch0:                %{name}-libgnomeprint_fix.patch
-Patch1:                %{name}-paths.patch
-Patch2:                %{name}-desktop.patch
+Source0:       http://snaught.com/%{name}/source/%{name}-%{version}.tar.gz
+# Source0-md5: df0374468989b1d1be433472dfad132b
+Patch0:                %{name}-DESTDIR.patch
+Patch1:                %{name}-desktop.patch
 URL:           http://snaught.com/glabels/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: intltool
-BuildRequires: libgnome-devel >= 2.2
-BuildRequires: libgnomecanvas-devel >= 2.2
-BuildRequires: libgnomeprint-devel >= 2.2
+BuildRequires: libbonobo-devel >= 2.0.0
 BuildRequires: libgnomeprintui-devel >= 2.2
 BuildRequires: libgnomeui-devel >= 2.3.3.1-2
 BuildRequires: libtool
+BuildRequires: libxml2-devel >= 2.4.23
 BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,7 +34,6 @@ wizyt
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 rm -f missing
@@ -47,7 +44,6 @@ intltoolize --copy --force
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-
 %configure \
        --enable-platform-gnome-2
 %{__make}
@@ -65,11 +61,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog NEWS AUTHORS
+%doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
-%dir %{_datadir}/glabels
-%dir %{_datadir}/glabels/ui
-%{_datadir}/glabels/ui/glabels-ui.xml
-%{_datadir}/glabels/predefined-labels.template
-%{_pixmapsdir}/glabels
-%{_desktopdir}/%{name}.desktop
+%{_datadir}/%{name}
+%{_pixmapsdir}/%{name}
+%{_desktopdir}/*.desktop