rpms/control-center/devel control-center.spec, 1.479, 1.480 no-tweaks.patch, 1.3, 1.4

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27948

Modified Files:
	control-center.spec no-tweaks.patch 
Log Message:
Add windows capplet back in a subpackage



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -p -r1.479 -r1.480
--- control-center.spec	25 Aug 2009 04:03:11 -0000	1.479
+++ control-center.spec	26 Aug 2009 01:40:37 -0000	1.480
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.27.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -171,6 +171,16 @@ for applications. This package contains 
 can install configuration files that are picked up by the control-center
 utilities.
 
+%package extra
+Summary: Additional utilities to configure the GNOME desktop
+Group: User Interface/Desktops
+Requires: %{name} = %{?epoch}:%{version}-%{release}
+
+%description extra
+The %{name}-extra package contains additions configuration utilities
+for the GNOME desktop.
+
+
 %prep
 %setup -q -n gnome-control-center-%{version}
 
@@ -362,7 +372,14 @@ fi
 %dir %{_datadir}/gnome-control-center
 %dir %{_datadir}/gnome-control-center/keybindings
 
+%files extra
+%defattr(-,root,root)
+%{_bindir}/gnome-window-properties
+
 %changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-2
+- Bring the window capplet back from the dead, in an -extra subpackage
+
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
 - Update to 2.27.91
 

no-tweaks.patch:
 Makefile.am        |    2 
 appearance-main.c  |    1 
 data/appearance.ui |  364 -----------------------------------------------------
 3 files changed, 367 deletions(-)

Index: no-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/no-tweaks.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- no-tweaks.patch	25 Aug 2009 03:40:33 -0000	1.3
+++ no-tweaks.patch	26 Aug 2009 01:40:37 -0000	1.4
@@ -395,16 +395,3 @@ diff -up gnome-control-center-2.27.91/ca
  	gedit-message-area.c \
  	gedit-message-area.h \
  	gnome-wp-info.c \
-diff -up gnome-control-center-2.27.91/capplets/Makefile.am.no-tweaks gnome-control-center-2.27.91/capplets/Makefile.am
---- gnome-control-center-2.27.91/capplets/Makefile.am.no-tweaks	2009-08-24 06:54:41.000000000 -0400
-+++ gnome-control-center-2.27.91/capplets/Makefile.am	2009-08-24 23:31:28.841988564 -0400
-@@ -6,8 +6,7 @@ SUBDIRS = \
- 	keybindings		\
- 	keyboard		\
- 	mouse			\
--	network			\
--	windows
-+	network
- 
- DIST_SUBDIRS = \
- 	common			\