rpms/amarok/FC-4 .cvsignore, 1.15, 1.16 amarok.spec, 1.31, 1.32 sources, 1.15, 1.16

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16984/FC-4

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.3.6
- prepare for modular X11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	25 Oct 2005 21:24:01 -0000	1.15
+++ .cvsignore	11 Nov 2005 13:41:11 -0000	1.16
@@ -1 +1 @@
-amarok-1.3.5.tar.bz2
+amarok-1.3.6.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- amarok.spec	25 Oct 2005 21:24:01 -0000	1.31
+++ amarok.spec	11 Nov 2005 13:41:11 -0000	1.32
@@ -6,13 +6,13 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.5
+Version:    1.3.6
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.5.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.6.tar.bz2
 Patch0:     amarok-1.3.4-helix-libs.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,7 +20,7 @@
 BuildRequires:  kdemultimedia-devel >= 6:3.2
 BuildRequires:  taglib-devel >= 1.3, esound-devel
 BuildRequires:  desktop-file-utils, gettext
-BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  libGL
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
@@ -134,6 +134,12 @@
 #find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %find_lang %{name}
+# HTML
+for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
+  lang=$(basename $lang_dir)
+  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
+  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+done
 
 
 %post
@@ -181,7 +187,6 @@
 %{_libdir}/mcop/amarok*
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
-%{_datadir}/doc/HTML/*/amarok
 # Arts engine
 %{_libdir}/libamarokarts*
 %{_libdir}/kde3/libamarok_artsengine_plugin.*
@@ -211,6 +216,10 @@
 
 
 %changelog
+* Tue Nov 08 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.6-1
+- version 1.3.6
+- BR libGL instead of xorg-x11-Mesa-libGL to prepare for X11R7
+
 * Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.5-1
 - version 1.3.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	25 Oct 2005 21:24:01 -0000	1.15
+++ sources	11 Nov 2005 13:41:11 -0000	1.16
@@ -1 +1 @@
-faac790ea432a784fa7d1ac6a34ee410  amarok-1.3.5.tar.bz2
+f97ac51a8c2f150ffc4cc0ef49c59a2f  amarok-1.3.6.tar.bz2