rpms/aquamarine/devel aquamarine-0.1.4-fixes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 aquamarine.spec, 1.2, 1.3 sources, 1.3, 1.4 aquamarine-0.1.3-Makefile.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-serv8795

Modified Files:
	.cvsignore aquamarine.spec sources 
Added Files:
	aquamarine-0.1.4-fixes.patch 
Removed Files:
	aquamarine-0.1.3-Makefile.patch 
Log Message:
New upstream release v0.1.4

aquamarine-0.1.4-fixes.patch:

--- NEW FILE aquamarine-0.1.4-fixes.patch ---
diff -urp aquamarine-0.1.4.orig/configure aquamarine-0.1.4/configure
--- aquamarine-0.1.4.orig/configure	2006-12-26 07:42:11.000000000 -0500
+++ aquamarine-0.1.4/configure	2007-01-02 15:02:27.000000000 -0500
@@ -34149,7 +34149,7 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_BERYL_SETTINGS 1
 _ACEOF
 
-    plugindir=$prefix/lib/beryl
+    plugindir=$libdir/beryl
 
   fi
 
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):
Only in aquamarine-0.1.4: Makefile.in.orig


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aquamarine/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2006 04:27:09 -0000	1.3
+++ .cvsignore	2 Jan 2007 20:05:41 -0000	1.4
@@ -1,2 +1,3 @@
 aquamarine-0.1.2.tar.bz2
 aquamarine-0.1.3.tar.bz2
+aquamarine-0.1.4.tar.bz2


Index: aquamarine.spec
===================================================================
RCS file: /cvs/extras/rpms/aquamarine/devel/aquamarine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aquamarine.spec	13 Dec 2006 04:27:09 -0000	1.2
+++ aquamarine.spec	2 Jan 2007 20:05:41 -0000	1.3
@@ -2,18 +2,18 @@
 Url:            http://www.beryl-project.org/
 License:        GPL
 Group:          User Interface/Desktops
-Version:        0.1.3
+Version:        0.1.4
 Release:        1%{?dist}
 
 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.3-Makefile.patch
+Patch0:         aquamarine-0.1.4-fixes.patch
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x ppc64
 
-Requires:       beryl-core >= %{version}
+Requires:       beryl-core >= %{version}, kdelibs, kdebase
 
 BuildRequires:  beryl-core-devel >= %{version}
 BuildRequires:  qt-devel, kdelibs-devel, kdebase-devel
@@ -39,18 +39,34 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f
+# Fix up xy_XY to just xy
+for lang in es_ES hu_HU it_IT pt_PT ru_RU
+do
+  dest=$(echo ${lang} | cut -d_ -f1)
+  mv $RPM_BUILD_ROOT%{_datadir}/locale/${lang} \
+    $RPM_BUILD_ROOT%{_datadir}/locale/${dest} 2>&1 > /dev/null
+done
+
+%find_lang %{name}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/aquamarine
+%{_libdir}/kde3/kcm_beryl.so
+%{_datadir}/applications/kde/beryl.desktop
+%{_datadir}/config.kcfg/aquamarine.kcfg
+%{_libdir}/beryl/backends/libkconfig.so
 
 
 %changelog
+* Tue Jan 02 2007 Jarod Wilson <jwilson at redhat.com> 0.1.4-1
+- New upstream release
+
 * Tue Dec 12 2006 Jarod Wilson <jwilson at redhat.com> 0.1.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aquamarine/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2006 04:27:09 -0000	1.3
+++ sources	2 Jan 2007 20:05:41 -0000	1.4
@@ -1 +1 @@
-aeb1c42f907f08226c5d4ce48b8d209c  aquamarine-0.1.3.tar.bz2
+6b0009bb7af2d37654d8001b1aecfdbe  aquamarine-0.1.4.tar.bz2


--- aquamarine-0.1.3-Makefile.patch DELETED ---