From 29a5f1be8d4222555a3fb3d920d8b80ea1f18082 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Jan 21 2008 20:41:48 +0000 Subject: fix spec --- diff --git a/GConf2-2.21.1-fixpkgconfig.patch b/GConf2-2.21.1-fixpkgconfig.patch deleted file mode 100644 index 9221aff..0000000 --- a/GConf2-2.21.1-fixpkgconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- GConf-2.21.1.orig/gconf-2.0.pc.in 2008-01-09 09:02:38.000000000 +0000 -+++ GConf-2.21.1/gconf-2.0.pc.in 2008-01-09 09:02:59.000000000 +0000 -@@ -8,7 +8,7 @@ - Name: gconf - Description: GNOME Config System. - Version: @VERSION@ --Requires: glib -+Requires: glib-2.0 - Requires.private: ORBit-2.0 - Libs: -L${libdir} -lgconf-@MAJOR_VERSION@ - Cflags: -I${includedir}/gconf/@MAJOR_VERSION@ diff --git a/GConf2.spec b/GConf2.spec index 762e2ed..4aff570 100644 --- a/GConf2.spec +++ b/GConf2.spec @@ -29,7 +29,6 @@ Requires: /usr/bin/killall Patch0: GConf-2.18.0.1-reload.patch # http://bugzilla.gnome.org/show_bug.cgi?id=356573 Patch1: GConf2-2.14.0-timeout.patch -Patch2: GConf2-2.21.1-fixpkgconfig.patch %description GConf is a process-transparent configuration database API used to @@ -66,7 +65,6 @@ which require GTK+. %setup -q -n GConf-%{version} %patch0 -p1 -b .reload %patch1 -p1 -b .timers -%patch2 -p1 -b .fixpkgconfig %build rm -f libtool @@ -79,9 +77,6 @@ make rm -fr $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -#chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.defaults -#chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.mandatory - mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.system