- new style macros

[packages/ggv.git] / ggv.spec

diff --git a/ggv.spec b/ggv.spec
index 6dddbaa5d77dc77d45137a4fd33fdaa3b1ec4843..37ef009e7e408b5bd6d3fad9e1989b5a9facf9f8 100644 (file)
--- a/ggv.spec
+++ b/ggv.spec
@@ -1,35 +1,38 @@
 Summary:       GNOME Ghostscript Viewer
-Summary(pl):   Przegl±darka Ghostscriptu dla GNOME
+Summary(pl):   Przegl±darka ghostscript dla GNOME
 Name:          ggv
-Version:       2.6.2
-Release:       1
+Version:       2.8.4
+Release:       3
 License:       GPL
 Group:         X11/Applications/Graphics
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: c02779b6ac22331c60df568301ca48c5
+Source0:       http://ftp.gnome.org/pub/gnome/sources/ggv/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5: 7a465dcc795ebab69daa0ed658d2e978
 Patch0:                %{name}-mime-pdf.patch
-Patch1:                %{name}-locale-names.patch
+Patch1:                %{name}-desktop.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.6.0
+BuildRequires: GConf2-devel >= 2.8.1
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: docbook-style-dsssl
 BuildRequires: gettext-devel
 BuildRequires: ghostscript
-BuildRequires: gnome-common
-BuildRequires: gtk+2-devel >= 2:2.4.0
+BuildRequires: gnome-common >= 2.8.0
+BuildRequires: gtk+2-devel >= 2:2.4.4
 BuildRequires: intltool >= 0.30
-BuildRequires: libgnomeui-devel >= 2.6.0
-BuildRequires: libbonobo-devel >= 2.6.0
+BuildRequires: libbonobo-devel >= 2.6.2
+BuildRequires: libgnomeui-devel >= 2.10.0-2
 BuildRequires: libtool
 BuildRequires: openjade
+BuildRequires: pkgconfig
 BuildRequires: popt-devel
 BuildRequires: rpm-build >= 4.1-8.2
+BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper
-Requires(post):        GConf2
-Requires(post):        scrollkeeper
+Requires(post,preun):  GConf2
+Requires(post,postun): desktop-file-utils
+Requires(post,postun): scrollkeeper
 Requires:      ghostscript
-Requires:      libbonobo >= 2.6.0
+Requires:      libbonobo >= 2.6.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,31 +41,26 @@ postscript interpretter. Use this program to preview postscript
 documents on your screen.
 
 %description -l pl
-Przegl±darka Ghostscriptu dla GNOME - graficzny frontend dla
-interpretera postscriptu o nazwie Ghostscript. U¿ywaj tego programu do
-przegl±dania postscriptowych dokumentów na Twoim ekranie.
+Przegl±darka ghostscriptu dla GNOME - graficzny frontend dla
+interpretera postscriptu o nazwie ghostscript. Program ten slu¿y do
+przegl±dania postscriptowych dokumentów na ekranie.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 
-mv po/{no,nb}.po
-sed -i -e 's/^Categories=GNOME;Application;/Categories=GTK;GNOME;/' \
-        ggv.desktop.in
-       
 %build
 rm -f missing acinclude.m4
 %{__libtoolize}
-glib-gettextize --copy --force
-intltoolize --copy --force
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__glib_gettextize}
+%{__intltoolize}
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure \
        --enable-platform-gnome-2 \
        --disable-schemas-install
-
 %{__make}
 
 %install
@@ -72,16 +70,24 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/scrollkeeper-update
-%gconf_schema_install
+%gconf_schema_install ggv.schemas
+%scrollkeeper_update_post
+%update_desktop_database_post
+
+%preun
+%gconf_schema_uninstall ggv.schemas
 
-%postun -p /usr/bin/scrollkeeper-update
+%postun
+%scrollkeeper_update_postun
+%update_desktop_database_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)