X-Git-Url: http://git.pld-linux.org/?p=packages%2Fggv.git;a=blobdiff_plain;f=ggv.spec;h=e82f8560ccdefa31b742903b1f95f681d59cd747;hp=8cfe47643a655cf6d1c89621cca98f7a02d5d339;hb=HEAD;hpb=9d4d8f6364fb51533b4a873131f1708472e36b4c

diff --git a/ggv.spec b/ggv.spec
index 8cfe476..e82f856 100644
--- a/ggv.spec
+++ b/ggv.spec
@@ -1,34 +1,39 @@
 Summary:	GNOME Ghostscript Viewer
-Summary(pl):	Przegl±darka ghostscript dla GNOME
+Summary(pl.UTF-8):	Przeglądarka ghostscript dla GNOME
 Name:		ggv
-Version:	2.8.0
-Release:	1
+Version:	2.8.5
+Release:	2
 License:	GPL
 Group:		X11/Applications/Graphics
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	1a8e9e43ef793ef3221c5afb15d14a81
-Patch0:		%{name}-mime-pdf.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/ggv/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	e8b338c1427e170ffbb33c62d0aaf191
+Patch0:		%{name}-desktop.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.7.91
+BuildRequires:	GConf2-devel >= 2.8.1
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	docbook-style-dsssl
 BuildRequires:	gettext-devel
 BuildRequires:	ghostscript
-BuildRequires:	gnome-common
+BuildRequires:	gnome-common >= 2.8.0
 BuildRequires:	gtk+2-devel >= 2:2.4.4
 BuildRequires:	intltool >= 0.30
-BuildRequires:	libgnomeui-devel >= 2.7.91
 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,preun):	GConf2
+Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
 Requires:	ghostscript
 Requires:	libbonobo >= 2.6.2
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,30 +41,26 @@ GNOME Ghostscript viewer - a GUI frontend to the Ghostscript
 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. Program ten slu¿y do
-przegl±dania postscriptowych dokumentów na ekranie.
+%description -l pl.UTF-8
+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
 
-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
@@ -70,22 +71,24 @@ rm -rf $RPM_BUILD_ROOT
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-umask 022
-/usr/bin/scrollkeeper-update
-%gconf_schema_install
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
+%gconf_schema_install ggv.schemas
+%scrollkeeper_update_post
+%update_desktop_database_post
+
+%preun
+%gconf_schema_uninstall ggv.schemas
 
 %postun
-umask 022
-/usr/bin/scrollkeeper-update
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
+%scrollkeeper_update_postun
+%update_desktop_database_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)