[minitunes/f15] Updated to new version Added gcc-c++ as BR Using a workaround to include locales (see BZ #729336)

Germán A. Racca skytux at fedoraproject.org
Wed Aug 17 18:10:26 UTC 2011


commit e2c63e19f3bc91f748fc736d4a9198bd8acc1dff
Author: Germán A. Racca <skytux at fedoraproject.org>
Date:   Wed Aug 17 15:11:16 2011 -0300

    Updated to new version
    Added gcc-c++ as BR
    Using a workaround to include locales (see BZ #729336)

 .gitignore     |    1 +
 minitunes.spec |   25 +++++++++++++++++++------
 sources        |    2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5fdda0e..2a5e45d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 minitunes-0.1.1.tar.gz
+/minitunes-1.0.tar.gz
diff --git a/minitunes.spec b/minitunes.spec
index 127d671..5f1c943 100644
--- a/minitunes.spec
+++ b/minitunes.spec
@@ -1,6 +1,6 @@
 Name:		minitunes
-Version:	0.1.1
-Release:	4%{?dist}
+Version:	1.0
+Release:	1%{?dist}
 Summary:	A better music player
 
 Group:		Applications/Multimedia
@@ -11,7 +11,7 @@ URL:		http://flavio.tordini.org/minitunes
 Source0:	http://flavio.tordini.org/files/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	qt-devel taglib-devel phonon-devel
+BuildRequires:	qt-devel taglib-devel phonon-devel gcc-c++
 Requires:	hicolor-icon-theme
 
 %description
@@ -46,20 +46,33 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install INSTALL_ROOT=%{buildroot}
 
+# There is a bug in find-lang.sh (see BZ #729336)
+# heavily borrowed from /usr/lib/rpm/find-lang.sh
+find %{buildroot} -type f -o -type l|sort|sed '
+s:'"%{buildroot}"'::
+s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3:
+s:^\([^%].*\)::
+/^$/d' > %{name}.lang
+
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc CHANGES COPYING INSTALL LICENSE.LGPL TODO
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/icons/hicolor/512x512/
+# don't list the locales, just the folders that contain them
+%dir %{_datadir}/%{name}/
+%dir %{_datadir}/%{name}/locale
 
 %changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Wed Aug 17 2011 Germán A. Racca <skytux at fedoraproject.org> 1.0-1
+- Updated to new version
+- Added gcc-c++ as BR
+- Using a workaround to include locales (see BZ #729336)
 
 * Fri Jul 30 2010 Germán A. Racca <gracca at gmail.com> 0.1.1-3
 - Added comment above license tag
diff --git a/sources b/sources
index 9a5cada..f8df3f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28124cda6482c304a2e5106206e010a9  minitunes-0.1.1.tar.gz
+af75ec3a42fc02a10d4c530bbd149a8d  minitunes-1.0.tar.gz


More information about the scm-commits mailing list