rpms/gthumb/devel gthumb.spec,1.105,1.106

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gthumb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30804

Modified Files:
	gthumb.spec 
Log Message:
Fix file lists



Index: gthumb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- gthumb.spec	4 Jan 2010 19:11:56 -0000	1.105
+++ gthumb.spec	4 Jan 2010 20:54:25 -0000	1.106
@@ -16,7 +16,6 @@ Source1: gthumb-importer
 Source2: gthumb-importer.desktop
 License: GPLv2+
 Group: User Interface/X
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -24,12 +23,7 @@ BuildRequires: nautilus >= %{nautilus_ve
 BuildRequires: libexif-devel
 BuildRequires: libiptcdata-devel
 BuildRequires: libopenraw-gnome-devel
-BuildRequires: libgnomeui-devel >= 2.2.0
 BuildRequires: libpng-devel
-BuildRequires: gettext
-BuildRequires: automake
-BuildRequires: autoconf
-BuildRequires: libtool
 BuildRequires: intltool
 BuildRequires: gnome-doc-utils >= 0.3.2
 
@@ -41,32 +35,30 @@ BuildRequires: gphoto2-devel >= %{gphoto
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
 
-Requires(post): scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(pre): GConf2 >= %{gconf_version}
 Requires(post): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
 
-Requires(postun): scrollkeeper
-Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
-
-Patch0: gthumb-libdir.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=577042
-Patch1: gthumb-import-dir.patch
-
 %description
 gthumb is an application for viewing, editing, and organizing
 collections of images.
 
+%package devel
+Summary: Header files needed for developing gthumb extensions
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The gthumb-devel package includes header files for the gthumb
+package.
+
 %prep
 %setup -q
-%patch0 -p1 -b .libdir
-%patch1 -p1 -b .import-dir
 
 # force regeneration
-rm data/gthumb.schemas
-
-autoreconf -i -f
+rm -f data/gthumb.schemas
 
 %build
 
@@ -103,14 +95,10 @@ install -p -m 644 %SOURCE2 $RPM_BUILD_RO
 rm -rf $RPM_BUILD_ROOT
 
 %post
-scrollkeeper-update -q
 update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gthumb.schemas > /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -125,24 +113,29 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
-scrollkeeper-update -q
 update-desktop-database -q
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
-%{_libdir}/gthumb
-%{_libdir}/bonobo/servers/GNOME_GThumb.server
+%{_libdir}/gthumb-2.0
+%{_datadir}/gthumb-2.0
 %{_datadir}/gthumb
 %{_datadir}/applications/*
-%{_mandir}/man*/*
-%{_datadir}/icons/hicolor/48x48/apps/gthumb.png
+%{_datadir}/icons/hicolor/*/apps/gthumb.png
+%{_datadir}/icons/hicolor/scalable/apps/gthumb.svg
+
+%files devel
+%{_includedir}/gthumb-2.0
 
 %changelog
 * Mon Jan  4 2010 Matthias Clasen <mclasen at redhat.com> - 2.11.1-1