- merged from DEVEL, up to version 2.8.0

Changed files:
    ggv.spec -> 1.101

diff --git a/ggv.spec b/ggv.spec
index c2b2b751f31ba8b619134e271a6824d0bf693e7d..428a35e63a9dabdd2cfcd3e074d70137a210a139 100644 (file)
--- a/ggv.spec
+++ b/ggv.spec
@@ -1,26 +1,25 @@
 Summary:       GNOME Ghostscript Viewer
 Summary(pl):   Przegl±darka ghostscript dla GNOME
 Name:          ggv
-Version:       2.6.2
+Version:       2.8.0
 Release:       1
 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/%{name}/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5: 1a8e9e43ef793ef3221c5afb15d14a81
 Patch0:                %{name}-mime-pdf.patch
-Patch1:                %{name}-locale-names.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.6.0
+BuildRequires: GConf2-devel >= 2.7.91
 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: gtk+2-devel >= 2:2.4.4
 BuildRequires: intltool >= 0.30
-BuildRequires: libgnomeui-devel >= 2.6.0
-BuildRequires: libbonobo-devel >= 2.6.0
+BuildRequires: libgnomeui-devel >= 2.7.91
+BuildRequires: libbonobo-devel >= 2.6.2
 BuildRequires: libtool
 BuildRequires: openjade
 BuildRequires: popt-devel
@@ -29,7 +28,7 @@ BuildRequires:        scrollkeeper
 Requires(post):        GConf2
 Requires(post):        scrollkeeper
 Requires:      ghostscript
-Requires:      libbonobo >= 2.6.0
+Requires:      libbonobo >= 2.6.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,12 +44,7 @@ przegl
 %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}
@@ -72,6 +66,8 @@ 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