rpms/beryl-manager/devel .cvsignore, 1.2, 1.3 beryl-manager.desktop, 1.1, 1.2 beryl-manager.spec, 1.4, 1.5 sources, 1.2, 1.3 beryl-manager.svg, 1.1, NONE

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4144

Modified Files:
	.cvsignore beryl-manager.desktop beryl-manager.spec sources 
Removed Files:
	beryl-manager.svg 
Log Message:
Update to 0.1.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Nov 2006 21:11:15 -0000	1.2
+++ .cvsignore	13 Dec 2006 04:25:27 -0000	1.3
@@ -1 +1,2 @@
 beryl-manager-0.1.2.tar.bz2
+beryl-manager-0.1.3.tar.bz2


Index: beryl-manager.desktop
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beryl-manager.desktop	22 Nov 2006 19:34:40 -0000	1.1
+++ beryl-manager.desktop	13 Dec 2006 04:25:27 -0000	1.2
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Beryl Manager
 Comment=Manage Beryl
-Icon=/usr/share/pixmaps/beryl-manager.svg
+Icon=/usr/share/icons/hicolor/scalable/apps/beryl-manager.svg
 Exec=beryl-manager
 Terminal=false
 Type=Application


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- beryl-manager.spec	22 Nov 2006 19:54:21 -0000	1.4
+++ beryl-manager.spec	13 Dec 2006 04:25:27 -0000	1.5
@@ -2,14 +2,13 @@
 Url:            http://www.beryl-project.org/
 License:        GPL
 Group:          User Interface/Desktops
-Version:        0.1.2
-Release:        4%{?dist}
+Version:        0.1.3
+Release:        1%{?dist}
 
 Summary:        Beryl window decorator and theme management utility
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
-Source1:        beryl-manager.svg
-Source2:        beryl-manager.desktop
+Source1:        beryl-manager.desktop
 Patch0:         beryl-manager-0.1.1-pidof.patch
 
 # libdrm is not available on these arches
@@ -47,10 +46,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora %{SOURCE2}
+  --add-category X-Fedora %{SOURCE1}
+# Fix up xy_XY to just xy
+for lang in ar_AR gl_GL my_MY sk_SK tr_TR
+do
+  dest=$(echo ${lang} | cut -d_ -f1)
+  mv $RPM_BUILD_ROOT%{_datadir}/locale/${lang} \
+    $RPM_BUILD_ROOT%{_datadir}/locale/${dest}
+done 
 %find_lang %{name}
 
 
@@ -73,12 +78,18 @@
 %doc COPYING
 %{_bindir}/beryl-manager
 %{_datadir}/pixmaps/*.png
-%{_datadir}/pixmaps/*.svg
+%{_datadir}/icons/hicolor/*/apps/beryl-manager.png
+%{_datadir}/icons/hicolor/scalable/apps/beryl-manager.svg
 %{_datadir}/applications/*.desktop
 %{_mandir}/man1/beryl-manager.1.gz
 
 
 %changelog
+* Tue Dec 12 2006 Jarod Wilson <jwilson at redhat.com> 0.1.3-1
+- New upstream release
+- Fix up a bunch of locale files (others should get added
+  to filesystem package in due course)
+
 * Wed Nov 22 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-4
 - Add new missing BR: desktop-file-utils
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Nov 2006 21:11:15 -0000	1.2
+++ sources	13 Dec 2006 04:25:27 -0000	1.3
@@ -1 +1 @@
-50c0235d59369674827ceaec7d36e53b  beryl-manager-0.1.2.tar.bz2
+c9559154c20db1bb41d3d480cfdf0299  beryl-manager-0.1.3.tar.bz2


--- beryl-manager.svg DELETED ---