rpms/gtk2-engines/devel .cvsignore, 1.8, 1.9 gtk-engines-2.6.2-clearlooks.patch, 1.2, 1.3 gtk2-engines.spec, 1.18, 1.19 sources, 1.8, 1.9

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Apr 18 23:45:21 UTC 2005 

Update of /cvs/dist/rpms/gtk2-engines/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11032

Modified Files:
	.cvsignore gtk-engines-2.6.2-clearlooks.patch 
	gtk2-engines.spec sources 
Log Message:
2.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Mar 2005 18:48:04 -0000	1.8
+++ .cvsignore	18 Apr 2005 23:45:17 -0000	1.9
@@ -4,3 +4,4 @@
 gtk-engines-2.6.2.tar.bz2
 clearlooks-0.4.tar.bz2
 clearlooks-0.5.tar.bz2
+gtk-engines-2.6.3.tar.bz2

gtk-engines-2.6.2-clearlooks.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: gtk-engines-2.6.2-clearlooks.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk-engines-2.6.2-clearlooks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-engines-2.6.2-clearlooks.patch	17 Mar 2005 14:04:30 -0000	1.2
+++ gtk-engines-2.6.2-clearlooks.patch	18 Apr 2005 23:45:17 -0000	1.3
@@ -1,250 +1,21 @@
---- gtk-engines-2.6.2/engines/clearlooks/Makefile.am.clearlooks	2005-02-18 15:18:40.000000000 -0500
-+++ gtk-engines-2.6.2/engines/clearlooks/Makefile.am	2005-03-17 08:12:20.372521000 -0500
+--- gtk-engines-2.6.3/engines/clearlooks/Makefile.am.clearlooks	2005-04-18 19:28:51.640357000 -0400
++++ gtk-engines-2.6.3/engines/clearlooks/Makefile.am	2005-04-18 19:29:02.480507000 -0400
 @@ -1,6 +1,6 @@
--INCLUDES = $(GTK2_CFLAGS)
-+INCLUDES = $(GTK_CFLAGS)
+ INCLUDES = $(GTK_CFLAGS)
  
 -enginedir = $(libdir)/gtk-2.0/$(GTK2_VERSION)/engines
 +enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
  engine_LTLIBRARIES = libclearlooks.la
  
- libclearlooks_la_SOURCES =              \
-@@ -14,6 +14,6 @@
- 	clearlooks_draw.h
- 
- libclearlooks_la_LDFLAGS = -module -avoid-version
--libclearlooks_la_LIBADD =  $(GTK2_LIBS)
-+libclearlooks_la_LIBADD =  $(GTK_LIBS)
- 
- EXTRA_DIST="bits.c support.c"
---- gtk-engines-2.6.2/engines/clearlooks/Makefile.in.clearlooks	2005-03-03 16:43:44.000000000 -0500
-+++ gtk-engines-2.6.2/engines/clearlooks/Makefile.in	2005-03-17 08:12:20.387505000 -0500
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.2 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -22,7 +22,7 @@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -38,15 +38,15 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--subdir = src
-+subdir = engines/clearlooks
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/pkg.m4 \
--	$(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_HEADER = $(top_builddir)/engines/crux/src/config.h \
-+	$(top_builddir)/engines/smooth/src/config.h
- CONFIG_CLEAN_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-@@ -63,16 +63,16 @@
- 	clearlooks_style.lo clearlooks_theme_main.lo support.lo \
- 	clearlooks_draw.lo
- libclearlooks_la_OBJECTS = $(am_libclearlooks_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/engines/crux/src -I$(top_builddir)/engines/smooth/src
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libclearlooks_la_SOURCES)
- DIST_SOURCES = $(libclearlooks_la_SOURCES)
-@@ -84,10 +84,13 @@
- AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
-+AS = @AS@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
-+BUILD_ENGINES = @BUILD_ENGINES@
-+BUILD_THEMES = @BUILD_THEMES@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
-@@ -100,6 +103,7 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -108,9 +112,8 @@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GTK2_CFLAGS = @GTK2_CFLAGS@
--GTK2_LIBS = @GTK2_LIBS@
--GTK2_VERSION = @GTK2_VERSION@
-+GTK_CFLAGS = @GTK_CFLAGS@
-+GTK_LIBS = @GTK_LIBS@
- GTK_VERSION = @GTK_VERSION@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -126,6 +129,7 @@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
- MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -140,16 +144,13 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- VERSION = @VERSION@
--XFCE_CFLAGS = @XFCE_CFLAGS@
--XFCE_LIBS = @XFCE_LIBS@
--X_CFLAGS = @X_CFLAGS@
--X_EXTRA_LIBS = @X_EXTRA_LIBS@
--X_LIBS = @X_LIBS@
--X_PRE_LIBS = @X_PRE_LIBS@
- ac_ct_AR = @ac_ct_AR@
-+ac_ct_AS = @ac_ct_AS@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
- ac_ct_F77 = @ac_ct_F77@
-+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -169,7 +170,6 @@
- build_vendor = @build_vendor@
- datadir = @datadir@
- exec_prefix = @exec_prefix@
--gnome_prefix = @gnome_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -190,8 +190,8 @@
- sharedstatedir = @sharedstatedir@
+ libclearlooks_la_SOURCES =		\
+--- gtk-engines-2.6.3/engines/clearlooks/Makefile.in.clearlooks	2005-04-18 19:29:19.645319000 -0400
++++ gtk-engines-2.6.3/engines/clearlooks/Makefile.in	2005-04-18 19:29:37.964981000 -0400
+@@ -191,7 +191,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--INCLUDES = $(GTK2_CFLAGS)
+ INCLUDES = $(GTK_CFLAGS)
 -enginedir = $(libdir)/gtk-2.0/$(GTK2_VERSION)/engines
-+INCLUDES = $(GTK_CFLAGS)
 +enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
  engine_LTLIBRARIES = libclearlooks.la
  libclearlooks_la_SOURCES = \
-         clearlooks_rc_style.c   \
-@@ -204,7 +204,7 @@
- 	clearlooks_draw.h
- 
- libclearlooks_la_LDFLAGS = -module -avoid-version
--libclearlooks_la_LIBADD = $(GTK2_LIBS)
-+libclearlooks_la_LIBADD = $(GTK_LIBS)
- EXTRA_DIST = "bits.c support.c"
- all: all-am
- 
-@@ -219,9 +219,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  engines/clearlooks/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  src/Makefile
-+	  $(AUTOMAKE) --gnu  engines/clearlooks/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- 	@case '$?' in \
---- gtk-engines-2.6.2/configure.ac.clearlooks	2005-03-07 11:25:40.000000000 -0500
-+++ gtk-engines-2.6.2/configure.ac	2005-03-17 08:15:16.809906000 -0500
-@@ -91,6 +91,9 @@
- 	fi
- fi
- 
-+BUILD_ENGINES="$BUILD_ENGINES clearlooks"
-+BUILD_THEMES="$BUILD_THEMES Clearlooks"
-+
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0,,
-                   AC_MSG_ERROR([GTK+-2.0 is required to compile gtk-engines]))
- 
-@@ -119,6 +122,7 @@
- engines/redmond/Makefile
- engines/smooth/Makefile
- engines/thinice/Makefile
-+engines/clearlooks/Makefile
- themes/Makefile
- themes/Crux/Makefile
- themes/Crux/gtk-2.0/Makefile
-@@ -135,6 +139,8 @@
- themes/Redmond/gtk-2.0/Makefile
- themes/ThinIce/Makefile
- themes/ThinIce/gtk-2.0/Makefile
-+themes/Clearlooks/Makefile
-+themes/Clearlooks/gtk-2.0/Makefile
- gtk-engines-2.pc
- gtk-engines.spec
- ]) 
---- gtk-engines-2.6.2/configure.clearlooks	2005-03-07 11:27:23.000000000 -0500
-+++ gtk-engines-2.6.2/configure	2005-03-17 08:15:23.525182000 -0500
-@@ -20574,6 +20574,9 @@
- 	fi
- fi
- 
-+BUILD_ENGINES="$BUILD_ENGINES clearlooks"
-+BUILD_THEMES="$BUILD_THEMES Clearlooks"
-+
- 
-   succeeded=no
- 
-@@ -20687,7 +20690,7 @@
-           ac_config_headers="$ac_config_headers engines/smooth/src/config.h"
- 
- 
--                                                                                                                                                                                                                                                                                                            ac_config_files="$ac_config_files Makefile engines/Makefile engines/crux/Makefile engines/crux/pixmaps/Makefile engines/hc/Makefile engines/industrial/Makefile engines/lighthouseblue/Makefile engines/metal/Makefile engines/mist/Makefile engines/redmond/Makefile engines/smooth/Makefile engines/thinice/Makefile themes/Makefile themes/Crux/Makefile themes/Crux/gtk-2.0/Makefile themes/Industrial/Makefile themes/Industrial/gtk-2.0/Makefile themes/LighthouseBlue/Makefile themes/LighthouseBlue/gtk-2.0/Makefile themes/Metal/Makefile themes/Metal/gtk-2.0/Makefile themes/Mist/Makefile themes/Mist/gtk-2.0/Makefile themes/Redmond/Makefile themes/Redmond/gtk/Makefile themes/Redmond/gtk-2.0/M!
akefile themes/ThinIce/Makefile themes/ThinIce/gtk-2.0/Makefile gtk-engines-2.pc gtk-engines.spec"
-+                                                                                                                                                                                                                                                                                                                                          ac_config_files="$ac_config_files Makefile engines/Makefile engines/crux/Makefile engines/crux/pixmaps/Makefile engines/hc/Makefile engines/industrial/Makefile engines/lighthouseblue/Makefile engines/metal/Makefile engines/mist/Makefile engines/redmond/Makefile engines/smooth/Makefile engines/thinice/Makefile engines/clearlooks/Makefile themes/Makefile themes/Crux/Makefile themes/Crux/gtk-2.0/Makefile themes/Industrial/Makefile themes/Industrial/gtk-2.0/Makefile themes/LighthouseBlue/Makefile themes/LighthouseBlue/gtk-2.0/Makefile themes/Metal/Makefile themes/Metal/gtk-2.0/Makefile themes/Mist/Makefile themes/Mist/gtk-2.0/Makefile themes/Redmond/Mak!
efile themes/Redmond/gtk/Makefile themes/Redmond/gtk-2.0/Makefile themes/ThinIce/Makefile themes/ThinIce/gtk-2.0/Makefile themes/Clearlooks/Makefile themes/Clearlooks/gtk-2.0/Makefile gtk-engines-2.pc gtk-engines.spec"
- 
- 
- cat >confcache <<\_ACEOF
-@@ -21272,6 +21275,7 @@
-   "engines/redmond/Makefile" ) CONFIG_FILES="$CONFIG_FILES engines/redmond/Makefile" ;;
-   "engines/smooth/Makefile" ) CONFIG_FILES="$CONFIG_FILES engines/smooth/Makefile" ;;
-   "engines/thinice/Makefile" ) CONFIG_FILES="$CONFIG_FILES engines/thinice/Makefile" ;;
-+  "engines/clearlooks/Makefile" ) CONFIG_FILES="$CONFIG_FILES engines/clearlooks/Makefile" ;;
-   "themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Makefile" ;;
-   "themes/Crux/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Crux/Makefile" ;;
-   "themes/Crux/gtk-2.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Crux/gtk-2.0/Makefile" ;;
-@@ -21288,6 +21292,8 @@
-   "themes/Redmond/gtk-2.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Redmond/gtk-2.0/Makefile" ;;
-   "themes/ThinIce/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/ThinIce/Makefile" ;;
-   "themes/ThinIce/gtk-2.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/ThinIce/gtk-2.0/Makefile" ;;
-+  "themes/Clearlooks/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Clearlooks/Makefile" ;;
-+  "themes/Clearlooks/gtk-2.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Clearlooks/gtk-2.0/Makefile" ;;
-   "gtk-engines-2.pc" ) CONFIG_FILES="$CONFIG_FILES gtk-engines-2.pc" ;;
-   "gtk-engines.spec" ) CONFIG_FILES="$CONFIG_FILES gtk-engines.spec" ;;
-   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+         ./src/clearlooks_rc_style.c	\


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gtk2-engines.spec	3 Apr 2005 21:22:25 -0000	1.18
+++ gtk2-engines.spec	18 Apr 2005 23:45:17 -0000	1.19
@@ -2,13 +2,12 @@
 
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.6.2
-Release:	4
+Version:        2.6.3
+Release:	1
 License:        GPL
 Group:          System Environment/Libraries
 Source:         gtk-engines-%{version}.tar.bz2
-Source1:        clearlooks-%{clearlooks_version}.tar.bz2
-Patch0:         gtk-engines-2.6.2-clearlooks.patch
+Patch0: 	gtk-engines-2.6.2-clearlooks.patch
 
 Requires:       gtk2 >= 2.2.0
 Conflicts:  	gnome-themes < 2.9.0
@@ -27,15 +26,9 @@
 
 %prep
 %setup -q -n gtk-engines-%{version}
-tar xjf %{SOURCE1}
-mv clearlooks-%{clearlooks_version}/src engines/clearlooks
-mkdir themes/Clearlooks
-cp themes/Crux/Makefile.{in,am} themes/Clearlooks
-mv clearlooks-%{clearlooks_version}/themes/Clearlooks/gtk-2.0 themes/Clearlooks
 %patch0 -p1 -b .clearlooks
 
 %build
-
 %configure
 make
 
@@ -68,6 +61,10 @@
 %{_datadir}/themes
 
 %changelog
+* Tue Apr 19 2005 Matthias Clasen <mclasen at redhat.com> 2.6.3-1
+- Update to 2.6.3
+- Clearlooks engine is now integrated
+
 * Sun Apr 03 2005 Warren Togami <wtogami at redhat.com> 2.6.2-4
 - obsolete FE3 gnome-theme-clearlooks to ensure smooth upgrade
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Mar 2005 18:48:04 -0000	1.8
+++ sources	18 Apr 2005 23:45:17 -0000	1.9
@@ -1,2 +1 @@
-11f9a1dcabf002aa904facac4293c1fd  gtk-engines-2.6.2.tar.bz2
-16ad9981ebbd816d7adfe05aadb0503b  clearlooks-0.5.tar.bz2
+ba5975f8ab390fa43fc0bf94f4a3b023  gtk-engines-2.6.3.tar.bz2

More information about the fedora-cvs-commits mailing list