- merged DEVEL branch

Changed files:
    ggv.spec -> 1.61

diff --git a/ggv.spec b/ggv.spec
index 53fcad6d9c3533b1c7de740303fd5a1377bf4bef..5854797d165c5cbc0f0f128c62573bc2dc648570 100644 (file)
--- a/ggv.spec
+++ b/ggv.spec
@@ -1,36 +1,29 @@
 Summary:       GNOME Ghostscript Viewer
 Summary(pl):   Przegl±darka Ghostscriptu dla GNOME
 Name:          ggv
-Version:       1.1.95
-Release:       2
+Version:       1.99.95
+Release:       1
 License:       GPL
 Group:         X11/Applications/Graphics
-Source0:       ftp://ftp.gnome.org//pub/GNOME/sources/ggv/%{version}/%{name}-%{version}.tar.gz
-Patch0:                %{name}-omf.patch
-Patch1:                %{name}-ac25x.patch
-Patch2:                %{name}-am16.patch
-Patch3:                %{name}-buffer.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/1.99/%{name}-%{version}.tar.bz2
 URL:           http://www.gnome.org/
-BuildRequires: GConf-devel >= 0.12
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bonobo-devel >= 0.33
+BuildRequires: autoconf
 BuildRequires: docbook-style-dsssl
 BuildRequires: gettext-devel
-BuildRequires: gnome-libs-devel
-BuildRequires: gtk+-devel >= 1.2.0
+BuildRequires: gtk+2-devel >= 2.0.6
 BuildRequires: libtool
-BuildRequires: libxml-devel
-BuildRequires: oaf-devel >= 0.6.2
+BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: openjade
 BuildRequires: scrollkeeper
+PreReq:                scrollkeeper
 Requires:      ghostscript
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
-%define                _sysconfdir     /etc/X11/GNOME
-%define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
+%define                _sysconfdir     /etc/X11/GNOME2
 
 %description
 GNOME Ghostscript viewer - a GUI frontend to the Ghostscript
@@ -44,22 +37,10 @@ przegl
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
-rm -f missing acinclude.m4
-%{__libtoolize}
-%{__gettextize}
-%{__aclocal} -I macros
-%{__autoconf}
-%{__automake}
-#CPPFLAGS="`gnome-config --cflags bonobo`"; export CPPFLAGS
-#LDFLAGS="-L%{_libdir} -lbonobox"; export LDFLAGS
-%configure \
-       --enable-bonobo
+%configure --enable-platform-gnome-2 \
+          --disable-install-schemas
 
 %{__make}
 
@@ -68,11 +49,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       Graphicsdir=%{_applnkdir}/Graphics/Viewers \
+       Graphicsdir=%{_applnkdir}/Graphics \
        omf_dest_dir=%{_omf_dest_dir}/%{name}
 
 %find_lang %{name} --with-gnome
 
+%post
+/usr/bin/scrollkeeper-update
+GCONF_CONFIG_SOURCE="" \
+%{_bindir}/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null 
+
+%postun
+/usr/bin/scrollkeeper-update
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,10 +72,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
-%{_applnkdir}/Graphics/Viewers/ggv.desktop
-%{_datadir}/gnome/ui/ggv*
-%{_pixmapsdir}/*
-%{_datadir}/oaf/*
+%attr(755,root,root) %{_libdir}/ggv*
+%{_applnkdir}/Graphics/ggv.desktop
+%{_datadir}/gnome-2.0/ui/ggv*
 %{_datadir}/idl/*
+%{_libdir}/bonobo/servers/*server
 %{_omf_dest_dir}/%{name}
-%{_sysconfdir}/gconf/schemas/ggv.schemas
+%{_pixmapsdir}/*
+%{_sysconfdir}/gconf/schemas/*