rpms/aquamarine/FC-6 .cvsignore, 1.3, 1.4 aquamarine.spec, 1.2, 1.3 sources, 1.3, 1.4

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/aquamarine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19867

Modified Files:
	.cvsignore aquamarine.spec sources 
Log Message:
New upstream release v0.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aquamarine/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2006 18:48:22 -0000	1.3
+++ .cvsignore	3 Jan 2007 16:01: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/FC-6/aquamarine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aquamarine.spec	13 Dec 2006 18:48:22 -0000	1.2
+++ aquamarine.spec	3 Jan 2007 16:01:41 -0000	1.3
@@ -2,22 +2,22 @@
 Url:            http://www.beryl-project.org/
 License:        GPL
 Group:          User Interface/Desktops
-Version:        0.1.3
-Release:        1%{?dist}
+Version:        0.1.4
+Release:        2%{?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
-BuildRequires:  libtool
+BuildRequires:  libtool, perl-XML-Parser, gettext-devel
 
 
 %description
@@ -39,18 +39,37 @@
 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-2
+- Add BR: for translations
+
+* 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/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2006 18:48:22 -0000	1.3
+++ sources	3 Jan 2007 16:01:41 -0000	1.4
@@ -1 +1 @@
-aeb1c42f907f08226c5d4ce48b8d209c  aquamarine-0.1.3.tar.bz2
+6b0009bb7af2d37654d8001b1aecfdbe  aquamarine-0.1.4.tar.bz2