rpms/kaffeine/devel kaffeine-0.8.7-codecs.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kaffeine.spec, 1.17, 1.18 sources, 1.6, 1.7

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13841

Modified Files:
	.cvsignore kaffeine.spec sources 
Added Files:
	kaffeine-0.8.7-codecs.patch 
Log Message:
* Sun Jul 06 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.7-1
- kaffeine-0.8.7


kaffeine-0.8.7-codecs.patch:

--- NEW FILE kaffeine-0.8.7-codecs.patch ---
diff -up kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs kaffeine-0.8.7/kaffeine/src/instwizard.cpp
--- kaffeine-0.8.7/kaffeine/src/instwizard.cpp.codecs	2007-06-03 08:55:14.000000000 -0500
+++ kaffeine-0.8.7/kaffeine/src/instwizard.cpp	2008-07-06 13:50:12.000000000 -0500
@@ -61,6 +61,8 @@ void InstWizard::internalWizard()
 	setHelpEnabled(page1, false);
 	setFinishEnabled(page1, false);
 
+        QDir d;
+
 	QString infoString;
 	QTextStream info(&infoString, IO_WriteOnly);
 
@@ -106,14 +108,16 @@ void InstWizard::internalWizard()
 		<< " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
 	*/
 	//WIN32-CODECS
+	/*
 	info << "<hr><b>" << i18n("WIN32 Codecs") << "...</b><br>";
-	QDir d("/usr/lib/win32");
+        d = DDir("@libdir@/codecs");
 	QStringList entries = d.entryList("wmv*");
 	if (entries.count())
 		info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
 	else
-		info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
+		info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in @libdir@/codecs. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
 		<< " <a href=\"http://www1.mplayerhq.hu/homepage/design7/codecs.html\">http://www.mplayerhq.hu</a>.</font>";
+        */
 
 	//LIBDVDCSS
 	info << "<br><hr><b>" << "libdvdcss" << "...</b><br>";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Jan 2008 22:46:07 -0000	1.6
+++ .cvsignore	6 Jul 2008 19:28:34 -0000	1.7
@@ -1 +1 @@
-kaffeine-0.8.6.tar.bz2
+kaffeine-0.8.7.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kaffeine.spec	20 Mar 2008 19:53:46 -0000	1.17
+++ kaffeine.spec	6 Jul 2008 19:28:34 -0000	1.18
@@ -12,10 +12,10 @@
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-Version: 0.8.6
-Release: 4%{?dist}
+Version: 0.8.7
+Release: 1%{?dist}
 
-%if "%{?nonfree:1}" != "1"
+%if 0%{?nonfree:1} == 0 
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
 %else
@@ -27,24 +27,27 @@
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
 Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
-Patch0:  %{name}-0.8.6-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:  kaffeine-0.8.6-optflags.patch
+Patch1:  kaffeine-0.8.7-codecs.patch
+
+BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: gettext
+# dvb
+BuildRequires: glibc-kernheaders
+%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
 BuildRequires: kdelibs3-devel
-BuildRequires: cdparanoia-devel cdparanoia
-BuildRequires: libvorbis-devel
-BuildRequires: xine-lib-devel
-%if 0%{?fedora} > 6
 BuildRequires: libxcb-devel
+%else
+BuildRequires: kdelibs-devel
 %endif
-# dvb
-BuildRequires: glibc-kernheaders 
-%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
+BuildRequires: libvorbis-devel
+BuildRequires: xine-lib-devel
 
-%if "%{?nonfree:1}" == "1" 
+%if 0%{?nonfree:1}
 Requires: kaffeine = %{version}
-Patch1: kaffeine-0.8.2-codecs.patch
 %define _with_lame --with-lame
 %{?_with_lame:BuildRequires: lame-devel}
 %if 0%{?fedora} > 4
@@ -87,8 +90,6 @@
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-# helps multilib upgrades
-Obsoletes: %{name} < %{version}-%{release}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -101,26 +102,29 @@
 
 %prep
 %setup -q -n kaffeine-%{version}
+
 %patch0 -p1 -b .optflags
-%{?nonfree:%patch1 -p1 -b .codecs}
+# FIXME
+#patch1 -p1 -b .codecs
+#sed -i -e "s|@libdir@|%{_libdir}|" kaffeine/src/instwizard.cpp
+
+# FIXME, must be a better workaround here
+sed -i -e 's|^ PACKAGE=kaffeine-.*| PACKAGE=kaffeine|' configure
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-# easier than patching, and using 
-#  --with-extra-includes=%{_includedir}/cdda below -- Rex
-CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
-
 %configure \
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --disable-final \
+  --with-extra-includes=%{_includedir}/cdda \
   %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
 
-%if "%{?nonfree:1}" == "1"
+%if 0%{?nonfree:1}
 make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
 %else
 make %{?_smp_mflags}
@@ -128,20 +132,20 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%if "%{?nonfree:1}" == "1"
-make install DESTDIR=$RPM_BUILD_ROOT -C kaffeine/src/input/disc/plugins/mp3lame
+%if 0%{?nonfree:1}
+make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame
 %else
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 ## File lists
 # locale's
 %find_lang %{name} 
 # HTML (1.0)
 HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
@@ -156,16 +160,16 @@
 fi
 
 # Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
+rm -f %{buildroot}%{_libdir}/lib*.la
+rm -f %{buildroot}%{_datadir}/mimelnk/application/x-mplayer2.desktop
 %endif
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
-%if "%{?nonfree:1}" == "1"
+%if 0%{?nonfree:1}
 %files 
 %defattr(-,root,root,-)
 %{_libdir}/kde3/libkaffeinemp3lame.*
@@ -217,10 +221,14 @@
 %{_includedir}/kaffeine/
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libkaffeinepart.so
+
 %endif
 
 
 %changelog
+* Sun Jul 06 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.7-1
+- kaffeine-0.8.7
+
 * Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
 - Patch to apply $RPM_OPT_FLAGS when building DVB libs.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Jan 2008 22:46:07 -0000	1.6
+++ sources	6 Jul 2008 19:28:34 -0000	1.7
@@ -1 +1 @@
-102cced6a686f5ffffee94652ca2a093  kaffeine-0.8.6.tar.bz2
+3ce644c3c5a9583e9df7187f2cf1d8de  kaffeine-0.8.7.tar.bz2