rpms/amarok/F-12 amarok.spec,1.164,1.165
Rex Dieter
rdieter at fedoraproject.org
Thu Sep 24 01:35:16 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/amarok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14061
Modified Files:
amarok.spec
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-2.20090923git
- 20090923git snapshot
Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- amarok.spec 22 Sep 2009 02:01:41 -0000 1.164
+++ amarok.spec 24 Sep 2009 01:35:16 -0000 1.165
@@ -1,17 +1,23 @@
+%define snap 20090923git
+
Name: amarok
Summary: Media player
Version: 2.1.90
-Release: 1%{?dist}
+Release: 2.%{snap}%{?dist}
Group: Applications/Multimedia
License: GPLv2+
Url: http://amarok.kde.org/
Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+#Source0: amarok-%{version}-%{snap}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch50: amarok-2.0.90-qtscript_not_required.patch
+# mostly a: git diff v2.1.90
+Patch100: post-2.1.90-%{snap}.patch
+
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -72,9 +78,10 @@ Obsoletes: amarok-utilities < 2.0.96
%prep
-%setup -q
+%setup -q
%patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .20090923git
%build
@@ -91,10 +98,10 @@ rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang amarok
-%find_lang amarokcollectionscanner_qt
-%find_lang amarokpkg
-%find_lang amarok_scriptengine_qscript
+%find_lang amarok
+%find_lang amarokcollectionscanner_qt
+%find_lang amarokpkg
+%find_lang amarok_scriptengine_qscript
cat amarokpkg.lang >> amarok.lang
cat amarok_scriptengine_qscript.lang >> amarok.lang
@@ -166,6 +173,9 @@ fi
%changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-2.20090923git
+- 20090923git snapshot
+
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.90-1
- amarok-2.1.90 (2.2rc1)
More information about the fedora-extras-commits
mailing list