rpms/gnome-screensaver/devel gnome-screensaver.spec,1.243,1.244

Matthias Clasen mclasen at fedoraproject.org
Thu Jun 17 03:37:07 UTC 2010


Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16211

Modified Files:
	gnome-screensaver.spec 
Log Message:
Cleanups



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- gnome-screensaver.spec	30 Mar 2010 20:39:45 -0000	1.243
+++ gnome-screensaver.spec	17 Jun 2010 03:37:06 -0000	1.244
@@ -25,6 +25,7 @@ Patch1: gnome-screensaver-2.20.0-default
 Patch2: gnome-screensaver-2.26.0-securitytoken.patch
 Patch7: gnome-screensaver-2.20.0-blank-by-default.patch
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
+Patch9: kill-dialog.patch
 
 URL: http://www.gnome.org
 BuildRequires: gtk2-devel => %{gtk2_version}
@@ -49,16 +50,10 @@ BuildRequires: automake, autoconf, libto
 BuildRequires: libXxf86misc-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXtst-devel
-Requires: gtk2 >= %{gtk2_version}
-Requires: libgnomeui >= %{libgnomeui_version}
-Requires: dbus-glib >= %{dbus_glib_version}
-Requires: libglade2 >= %{libglade2_version}
-Requires: libxml2 >= %{libxml2_version}
 Requires(pre): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires: redhat-menus >= %{redhat_menus_version}
-Requires: gnome-desktop >= %{gnome_desktop_version}
 Requires: system-logos
 # since we use it, and pam spams the log if a module is missing
 Requires: gnome-keyring-pam
@@ -75,6 +70,7 @@ simple, sane, secure defaults and be wel
 #%patch2 -p1 -b .securitytoken
 %patch7 -p1 -b .blank-by-default
 %patch8 -p1 -b .selinux-permit
+%patch9 -p1 -b .kill-dialog
 
 autoreconf -f -i
 
@@ -86,7 +82,6 @@ autoreconf -f -i
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -102,9 +97,6 @@ desktop-file-install --vendor gnome --de
 # hide xscreensaver from the menus
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas >/dev/null
@@ -143,6 +135,10 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Wed Jun 16 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.0-2
+- Kill explicit library deps
+- Nuke %%clean
+
 * Tue Mar 30 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.0-1
 - Update to 2.30.0
 



More information about the scm-commits mailing list