rpms/gnome-themes/devel .cvsignore, 1.14, 1.15 gnome-themes-2.10.0-clearlooks.patch, 1.1, 1.2 gnome-themes.spec, 1.20, 1.21 sources, 1.14, 1.15

Tue Mar 29 18:41:25 UTC 2005

Update of /cvs/dist/rpms/gnome-themes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29119

Modified Files:
	.cvsignore gnome-themes-2.10.0-clearlooks.patch 
	gnome-themes.spec sources 
Log Message:
Update Clearlooks to 0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15

--- .cvsignore	17 Mar 2005 07:11:08 -0000	1.14
+++ .cvsignore	29 Mar 2005 18:41:22 -0000	1.15
@@ -1,2 +1,4 @@
 clearlooks-0.4.tar.bz2
 gnome-themes-2.10.0.tar.bz2
+clearlooks-0.5.tar.bz2
+MCity-clearlooks-metacity-0.5.tar.gz

gnome-themes-2.10.0-clearlooks.patch:
 configure.in                          |   10 ++++++++++
 desktop-themes/Clearlooks/Makefile.am |    5 -----
 desktop-themes/Makefile.am            |    1 +
 gtk-themes/Clearlooks/Makefile.am     |    3 +++
 gtk-themes/Makefile.am                |    2 +-
 icon-themes/Makefile.am               |    2 +-
 metacity-themes/Makefile.am           |    1 +
 7 files changed, 17 insertions(+), 7 deletions(-)

Index: gnome-themes-2.10.0-clearlooks.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes-2.10.0-clearlooks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-themes-2.10.0-clearlooks.patch	17 Mar 2005 14:05:19 -0000	1.1
+++ gnome-themes-2.10.0-clearlooks.patch	29 Mar 2005 18:41:22 -0000	1.2
@@ -1,24 +1,29 @@
---- /dev/null	2005-03-10 03:42:55.766712256 -0500
-+++ gnome-themes-2.10.0/gtk-themes/Clearlooks/Makefile.am	2005-03-17 08:22:55.234021000 -0500
+--- /dev/null	2005-03-23 11:32:28.154653280 -0500
++++ gnome-themes-2.10.0/gtk-themes/Clearlooks/Makefile.am	2005-03-29 13:35:52.938643000 -0500
 @@ -0,0 +1,3 @@
 +SUBDIRS = \
 +	gtk-2.0
 +        
 --- gnome-themes-2.10.0/gtk-themes/Makefile.am.clearlooks	2005-01-14 14:49:25.000000000 -0500
-+++ gnome-themes-2.10.0/gtk-themes/Makefile.am	2005-03-17 08:25:01.746385000 -0500
++++ gnome-themes-2.10.0/gtk-themes/Makefile.am	2005-03-29 13:35:52.943636000 -0500
 @@ -1 +1 @@
 -SUBDIRS=Glider Grand-Canyon Simple Smokey-Blue
 +SUBDIRS=Glider Grand-Canyon Simple Smokey-Blue Clearlooks-DeepSky Clearlooks-Olive
 --- gnome-themes-2.10.0/metacity-themes/Makefile.am.clearlooks	2004-09-15 10:36:16.000000000 -0400
-+++ gnome-themes-2.10.0/metacity-themes/Makefile.am	2005-03-17 08:22:55.251004000 -0500
++++ gnome-themes-2.10.0/metacity-themes/Makefile.am	2005-03-29 13:35:52.949630000 -0500
 @@ -1,4 +1,5 @@
  THEMES=			\
 +	Clearlooks	\
  	Glider		\
  	Mist		\
  	Sandwish	\
---- gnome-themes-2.10.0/desktop-themes/Clearlooks/Makefile.am.clearlooks	2005-02-24 12:26:17.000000000 -0500
-+++ gnome-themes-2.10.0/desktop-themes/Clearlooks/Makefile.am	2005-03-17 08:22:55.256001000 -0500
+--- gnome-themes-2.10.0/icon-themes/Makefile.am.clearlooks	2004-05-13 11:54:46.000000000 -0400
++++ gnome-themes-2.10.0/icon-themes/Makefile.am	2005-03-29 13:35:52.968611000 -0500
+@@ -1 +1 @@
+-SUBDIRS=Crux Flat-Blue Sandy Smokey-Blue Smokey-Red
++SUBDIRS=Crux Flat-Blue Sandy Smokey-Blue Smokey-Red Clearlooks
+--- gnome-themes-2.10.0/desktop-themes/Clearlooks/Makefile.am.clearlooks	2005-03-20 14:10:20.000000000 -0500
++++ gnome-themes-2.10.0/desktop-themes/Clearlooks/Makefile.am	2005-03-29 13:35:52.975606000 -0500
 @@ -3,8 +3,3 @@
  theme_DATA = index.theme
  
@@ -26,10 +31,10 @@
 -
 -SUBDIRS = \
 -	gtk-2.0    \
--	metacity-1
+-	icons
 -        
 --- gnome-themes-2.10.0/desktop-themes/Makefile.am.clearlooks	2004-08-17 06:27:32.000000000 -0400
-+++ gnome-themes-2.10.0/desktop-themes/Makefile.am	2005-03-17 08:22:55.260996000 -0500
++++ gnome-themes-2.10.0/desktop-themes/Makefile.am	2005-03-29 13:35:53.000579000 -0500
 @@ -1,4 +1,5 @@
  SUBDIRS=		\
 +	Clearlooks	\
@@ -37,8 +42,8 @@
  	Glider		\
  	Grand-Canyon	\
 --- gnome-themes-2.10.0/configure.in.clearlooks	2005-03-07 09:49:41.000000000 -0500
-+++ gnome-themes-2.10.0/configure.in	2005-03-17 08:24:41.617533000 -0500
-@@ -97,12 +97,18 @@
++++ gnome-themes-2.10.0/configure.in	2005-03-29 13:38:23.711717000 -0500
+@@ -97,11 +97,16 @@
  desktop-themes/Smokey-Blue/Makefile
  desktop-themes/Glider/Makefile
  desktop-themes/Traditional/Makefile
@@ -53,7 +58,17 @@
 +gtk-themes/Clearlooks-Olive/Makefile
 +gtk-themes/Clearlooks-Olive/gtk-2.0/Makefile
  metacity-themes/Makefile
-+metacity-themes/Clearlooks/Makefile
  icon-themes/Makefile
  icon-themes/Crux/Makefile
- icon-themes/Flat-Blue/Makefile
+@@ -109,6 +114,11 @@
+ icon-themes/Sandy/Makefile
+ icon-themes/Smokey-Blue/Makefile
+ icon-themes/Smokey-Red/Makefile
++icon-themes/Clearlooks/Makefile
++icon-themes/Clearlooks/16x16/Makefile
++icon-themes/Clearlooks/16x16/gtk/Makefile
++icon-themes/Clearlooks/24x24/Makefile
++icon-themes/Clearlooks/24x24/gtk/Makefile
+ common/Makefile
+ HighContrast/Makefile
+ HighContrast/gtk-2.0/Makefile


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-themes.spec	17 Mar 2005 14:05:19 -0000	1.20
+++ gnome-themes.spec	29 Mar 2005 18:41:22 -0000	1.21
@@ -1,10 +1,13 @@
+%define clearlooks_version 0.5
+
 Summary: Themes collection for GNOME
 Name: gnome-themes
 Version: 2.10.0
-Release: 2
+Release: 3
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 Source: %{name}-%{version}.tar.bz2
-Source1: clearlooks-0.4.tar.bz2
+Source1: clearlooks-%{clearlooks_version}.tar.bz2
+Source2: MCity-clearlooks-metacity-%{clearlooks_version}.tar.gz
 Patch1: gnome-themes-hidden.patch
 Patch2: gnome-themes-2.10.0-clearlooks.patch
 License: LGPL
@@ -29,10 +32,11 @@
 %setup -q
 %patch1 -p1 -b .hidden
 tar xjf %{SOURCE1}
-mv clearlooks-0.4/themes/Clearlooks/metacity-1 metacity-themes/Clearlooks
-mv clearlooks-0.4/themes/Clearlooks desktop-themes
-mv clearlooks-0.4/themes/Clearlooks-DeepSky gtk-themes
-mv clearlooks-0.4/themes/Clearlooks-Olive gtk-themes
+mv clearlooks-%{clearlooks_version}/themes/Clearlooks/icons icon-themes/Clearlooks
+mv clearlooks-%{clearlooks_version}/themes/Clearlooks desktop-themes
+mv clearlooks-%{clearlooks_version}/themes/Clearlooks-DeepSky gtk-themes
+mv clearlooks-%{clearlooks_version}/themes/Clearlooks-Olive gtk-themes
+tar xzf %{SOURCE2} -C metacity-themes
 %patch2 -p1 -b .clearlooks
 
 %build


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	17 Mar 2005 07:11:08 -0000	1.14
+++ sources	29 Mar 2005 18:41:22 -0000	1.15
@@ -1,2 +1,3 @@
-d714197da50c4eb3c2278f3c786fa996  clearlooks-0.4.tar.bz2
 daa8b0a35f425ad442c950d615c026af  gnome-themes-2.10.0.tar.bz2
+16ad9981ebbd816d7adfe05aadb0503b  clearlooks-0.5.tar.bz2
+7cad4d05b820260b61d63d3cb361877b  MCity-clearlooks-metacity-0.5.tar.gz


