rpms/aquamarine/devel aquamarine-0.1.9999.2-fixes.patch, NONE, 1.1 aquamarine.spec, 1.8, 1.9 aquamarine-0.1.4-fixes.patch, 1.1, NONE

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/aquamarine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7401

Modified Files:
	aquamarine.spec 
Added Files:
	aquamarine-0.1.9999.2-fixes.patch 
Removed Files:
	aquamarine-0.1.4-fixes.patch 
Log Message:
Fix up -fixes patch

aquamarine-0.1.9999.2-fixes.patch:

--- NEW FILE aquamarine-0.1.9999.2-fixes.patch ---
diff -urp aquamarine-0.1.4.orig/Makefile.in aquamarine-0.1.4/Makefile.in
--- aquamarine-0.1.4.orig/Makefile.in	2006-12-26 07:42:14.000000000 -0500
+++ aquamarine-0.1.4/Makefile.in	2007-01-02 15:00:42.000000000 -0500
@@ -814,21 +814,6 @@ uninstall-info: uninstall-info-recursive
 	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-info-am uninstall-local
 
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
-	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
-
-$(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
-	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure_in
-
-$(top_srcdir)/configure.files: $(top_srcdir)/subdirs $(CONF_FILES)
-	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure.files $(top_srcdir)/admin/cvs.sh
-
-$(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh
-	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am
-
-$(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh
-	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs
-
 # defining default rules for files that may not be present
 $(top_srcdir)/Makefile.am.in:
 $(CONF_FILES):


Index: aquamarine.spec
===================================================================
RCS file: /cvs/extras/rpms/aquamarine/devel/aquamarine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aquamarine.spec	20 Feb 2007 16:40:10 -0000	1.8
+++ aquamarine.spec	20 Feb 2007 18:56:53 -0000	1.9
@@ -8,7 +8,7 @@
 Summary:        Themeable window decorator and compositing manager for Beryl
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
-Patch0:         aquamarine-0.1.4-fixes.patch
+Patch0:         aquamarine-0.1.9999.2-fixes.patch
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x ppc64


--- aquamarine-0.1.4-fixes.patch DELETED ---