SPECS: GConf2.spec - rel.7, --as-needed support, dropped bogus xin...

[freetz]

Author: freetz                       Date: Mon Jul 10 20:46:14 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel.7, --as-needed support, dropped bogus xinitrc subpackage, added
  borrowed from ubuntu post installation script

---- Files affected:
SPECS:
   GConf2.spec (1.114 -> 1.115) 

---- Diffs:

================================================================
Index: SPECS/GConf2.spec
diff -u SPECS/GConf2.spec:1.114 SPECS/GConf2.spec:1.115
--- SPECS/GConf2.spec:1.114	Sat Jul  8 00:04:58 2006
+++ SPECS/GConf2.spec	Mon Jul 10 22:46:08 2006
@@ -12,12 +12,11 @@
 Summary(ru):	óÉÓÔĹÍÁ ËĎÎĆÉÇŐŇÁĂÉÉ GNOME 2
 Name:		GConf2
 Version:	2.14.0
-Release:	6
+Release:	7
 License:	LGPL
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/gnome/sources/GConf/2.14/GConf-%{version}.tar.bz2
 # Source0-md5:	d07c2efcaf477cf34225c604a04b6271
-Source1:	%{name}-merge-tree.xinit
 Patch0:		%{name}-NO_MAJOR_VERSION.patch
 Patch1:		%{name}-path.patch
 URL:		http://www.gnome.org/
@@ -25,18 +24,20 @@
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.11.2
-BuildRequires:	gtk+2-devel >= 2:2.9.2
-BuildRequires:	gtk-doc >= 1.4-2
+BuildRequires:	glib2-devel >= 1:2.12.0
+BuildRequires:	gtk+2-devel >= 2:2.10.0
+BuildRequires:	gtk-doc >= 1.6
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.25
+BuildRequires:	libxml2-devel >= 1:2.6.26
 BuildRequires:	openldap-devel
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 BuildRequires:	rpmbuild(macros) >= 1.197
+Requires(post):	GConf2 >= 2.14.0
 Requires:	ORBit2 >= 1:2.14.0
-Requires:	glib2 >= 1:2.11.2
+Requires:	glib2 >= 1:2.12.0
+Obsoletes:	GConf2-xinitrc
 Obsoletes:	libGConf2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -63,7 +64,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	ORBit2-devel >= 1:2.14.0
 Requires:	gtk-doc-common
-Requires:	libxml2-devel >= 1:2.6.25
+Requires:	libxml2-devel >= 1:2.6.26
 Obsoletes:	libGConf2-devel
 
 %description devel
@@ -114,19 +115,6 @@
 adresowej i kalendarza w jego wpisie LDAP, Evolution zostanie
 automatycznie skonfigurowane do używania tych adresów.
 
-%package xinitrc
-Summary:	GConf xinitrc scripts
-Summary(pl):	Skrypty xinitrc GConfa
-Group:		X11
-Requires:	%{name} = %{version}-%{release}
-Requires:	xinitrc
-
-%description xinitrc
-This is a script for xinit-rc, which monitors users .gconf dir, merging it into single tree if neceserry or creates a new default one.
-
-%description xinitrc -l pl
-To jest skrypt dla xinit-rc, który monitoruje katalog .gconf użytkowników, spajając go w pojedyncze drzewo, gdy to koniecznie, lub tworząc nowe, domyślne.
-
 %prep
 %setup -q -n GConf-%{version}
 %patch0 -p1
@@ -140,6 +128,7 @@
 %{__autoheader}
 %{__autoconf}
 %{__automake}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure \
 	%{!?with_static_libs:--disable-static} \
 	--enable-gtk-doc \
@@ -149,13 +138,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}{/gconf/schemas,/X11/xinit/xinitrc.d}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/GConf2-merge-tree
-
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 %find_lang %{name}
@@ -166,7 +153,20 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
+%post
+/sbin/ldconfig
+umask 022
+for GCONF_DIR in %{_sysconfdir}/gconf/gconf.xml.mandatory %{_sysconfdir}/gconf/gconf.xml.defaults ;
+    do
+    GCONF_TREE=$GCONF_DIR/%gconf-tree.xml
+    if [ ! -f "$GCONF_TREE" ]; then
+	gconf-merge-tree "$GCONF_DIR"
+        chmod 644 "$GCONF_TREE"
+        find "$GCONF_DIR" -mindepth 1 -maxdepth 1 -type d -exec rm -rf \{\} \;
+        rm -f "$GCONF_DIR/%gconf.xml"
+    fi
+done
+	    
 %postun	-p /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -212,16 +212,16 @@
 %{_datadir}/GConf/schema/evoldap.schema
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gconf/2/evoldap.conf
 
-%files xinitrc
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sysconfdir}/X11/xinit/xinitrc.d/*
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115  2006/07/10 20:46:08  freetz
+- rel.7, --as-needed support, dropped bogus xinitrc subpackage, added
+  borrowed from ubuntu post installation script
+
 Revision 1.114  2006/07/07 22:04:58  czarny
  - R parent GConf2 package for xinitrc subpackage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/GConf2.spec?r1=1.114&r2=1.115&f=u