rpms/kaffeine/devel kaffeine-1.0-pre1-kernel_headers.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 kaffeine.spec, 1.25, 1.26 sources, 1.7, 1.8 kaffeine-0.8.7-codecs.patch, 1.1, NONE kaffeine-0.8.7-epg.patch, 1.1, NONE kaffeine-0.8.7-optflags.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Sun Apr 26 19:42:28 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6243
Modified Files:
.cvsignore kaffeine.spec sources
Added Files:
kaffeine-1.0-pre1-kernel_headers.patch
Removed Files:
kaffeine-0.8.7-codecs.patch kaffeine-0.8.7-epg.patch
kaffeine-0.8.7-optflags.patch
Log Message:
* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.1.pre1
- kaffeine-1.0-pre1
kaffeine-1.0-pre1-kernel_headers.patch:
--- NEW FILE kaffeine-1.0-pre1-kernel_headers.patch ---
diff -up kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp
--- kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp.kernel_headers 2009-04-26 13:38:11.000000000 -0500
+++ kaffeine-1.0-pre1/src/dvb/dvbdevice.cpp 2009-04-26 14:34:24.526814875 -0500
@@ -24,7 +24,7 @@
* workaround buggy kernel includes
* asm/types.h doesn't define __u64 in ansi mode, but linux/dvb/dmx.h needs it
*/
-typedef quint64 __u64;
+//typedef quint64 __u64;
#include <cmath>
#include <errno.h>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 6 Jul 2008 19:28:34 -0000 1.7
+++ .cvsignore 26 Apr 2009 19:41:58 -0000 1.8
@@ -1 +1 @@
-kaffeine-0.8.7.tar.bz2
+kaffeine-1.0-pre1.tar.gz
Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kaffeine.spec 12 Apr 2009 18:25:20 -0000 1.25
+++ kaffeine.spec 26 Apr 2009 19:41:58 -0000 1.26
@@ -1,233 +1,88 @@
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
-%define kdelibs3 kdelibs3
-BuildRequires: libxcb-devel
-%else
-%define kdelibs3 kdelibs
-BuildRequires: libutempter-devel
-%endif
-
-## define to build freeworld bits (for that other repo)
-#define freeworld 1
-
-# FIXME
-#if 0%{?fedora} > 10
-#define _without_dvb --without-dvb
-#endif
+%define pre pre1
-Version: 0.8.7
-Release: 7%{?dist}
-
-%if 0%{?freeworld:1} == 0
-# Fedora Review: http://bugzilla.redhat.com/213432
Name: kaffeine
-%else
-Name: kaffeine-freeworld
-%endif
+Version: 1.0
+Release: 0.1.%{pre}%{?dist}
License: GPLv2+
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{?pre:-%{pre}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: kaffeine-0.8.7-optflags.patch
-Patch1: kaffeine-0.8.7-codecs.patch
-Patch2: kaffeine-0.8.7-epg.patch
+Patch1: kaffeine-1.0-pre1-kernel_headers.patch
-BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gettext
-BuildRequires: gstreamer-plugins-base-devel gstreamer-devel
-BuildRequires: %{kdelibs3}-devel
-BuildRequires: libvorbis-devel
-BuildRequires: libXext-devel libXinerama-devel libXtst-devel
-BuildRequires: xine-lib-devel
-
-%if 0%{?freeworld:1}
-Requires: kaffeine = %{version}
-%define _with_lame --with-lame
-%{?_with_lame:BuildRequires: lame-devel}
-%if 0%{?fedora} > 4
-# can view dvd's if libdvdcss is available
-#Requires(hint): libdvdcss
-# extra/freeworld codec support
-Requires(hint): xine-lib-extras-freeworld
-%endif
-
-%description
-Extra "freeworld" support bits for kaffeine, including DVD playback, MP3
-decoding, as well as extended audio/video codec support.
+BuildRequires: kdelibs4-devel
+BuildRequires: phonon-devel
-%else
-
-%if 0%{?libs}
-Requires: %{name}-libs = %{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{version}-%{release}
-Provides: %{name}-libs = %{version}-%{release}
-%endif
+Obsoletes: kaffeine-libs < 1.0
+Obsoletes: kaffeine-devel < 1.0
%description
-Kaffeine is a xine-based media player for KDE. It plays back CDs,
-and VCDs, and can decode all (local or streamed) multimedia formats
-supported by xine-lib.
-Additionally, Kaffeine is fully integrated in KDE, it supports drag
-and drop and provides an editable playlist, a bookmark system, a
-Konqueror plugin, OSD and much more.
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{kdelibs3}-devel
-%description devel
-%{summary}.
-
-%package libs
-Summary: Runtime libraries for %{name}
-Group: System Environment/Libraries
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
-
-%endif
-
+Kaffeine is a xine-based media player for KDE.
%prep
-%setup -q -n kaffeine-%{version}
-
-%patch0 -p1 -b .optflags
-# FIXME
-#patch1 -p1 -b .codecs
-#sed -i -e "s|@libdir@|%{_libdir}|" kaffeine/src/instwizard.cpp
-%patch2 -p1 -b .epg
+%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
-# FIXME, must be a better workaround here
-sed -i -e 's|^ PACKAGE=kaffeine-.*| PACKAGE=kaffeine|' configure
+%patch1 -p1 -b .kernel_headers
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
-%configure \
- --disable-rpath \
- --enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking --disable-final \
- --with-extra-includes=%{_includedir}/cdda \
- --with-gstreamer \
- %{?_without_dvb} %{!?_without_dvb:--with-dvb} \
- %{?_with_lame} %{!?_with_lame:--without-lame}
-
-%if 0%{?freeworld:1}
-make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
-%else
-make %{?_smp_mflags}
-%endif
+make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
-%if 0%{?freeworld:1}
-make install DESTDIR=%{buildroot} -C kaffeine/src/input/disc/plugins/mp3lame
-%else
-make install DESTDIR=%{buildroot}
-
-## File lists
-# locale's
-%find_lang %{name}
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-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
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
- done
- popd
- fi
-done
-fi
+mv %{buildroot}%{_kde4_iconsdir}/oxygen \
+ %{buildroot}%{_kde4_iconsdir}/hicolor
-# Unpackaged files
-rm -f %{buildroot}%{_libdir}/lib*.la
-rm -f %{buildroot}%{_datadir}/mimelnk/application/x-mplayer2.desktop
-%endif
+%find_lang %{name}
%clean
rm -rf %{buildroot}
-%if 0%{?freeworld:1}
-%files
-%defattr(-,root,root,-)
-%{_libdir}/kde3/libkaffeinemp3lame.*
-%{_datadir}/services/kaffeinemp3lame.desktop
-%else
-
%post
-%{!?libs:/sbin/ldconfig}
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-%{!?libs:/sbin/ldconfig}
if [ $1 -eq 0 ] ; then
- update-desktop-database %{_datadir}/applications &>/dev/null
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ update-desktop-database %{_datadir}/applications &>/dev/null
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
update-desktop-database %{_datadir}/applications &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%if 0%{?libs}
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-%endif
-
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{_bindir}/kaffeine
-%{_libdir}/libkaffeinepart.so
-%{_libdir}/kde3/lib*.*
-%{_datadir}/appl*/*/*.desktop
-%{_datadir}/apps/gstreamerpart/
-%{_datadir}/apps/kaffeine/
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_datadir}/apps/profiles/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/service*/*.desktop
-
-%if 0%{?libs}
-%files libs
-%defattr(-,root,root,-)
-%endif
-%{_libdir}/lib*.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/kaffeine/
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkaffeinepart.so
-
-%endif
+%doc AUTHORS COPYING TODO
+%{_kde4_bindir}/kaffeine
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_appsdir}/kaffeine/
+%{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_iconsdir}/hicolor/*/*/*
%changelog
+* Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.1.pre1
+- kaffeine-1.0-pre1
+
* Sun Apr 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-7
- re-enable dvb (#495379)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 6 Jul 2008 19:28:34 -0000 1.7
+++ sources 26 Apr 2009 19:41:58 -0000 1.8
@@ -1 +1 @@
-3ce644c3c5a9583e9df7187f2cf1d8de kaffeine-0.8.7.tar.bz2
+ecae6fd84103a268daf17b61784d837f kaffeine-1.0-pre1.tar.gz
--- kaffeine-0.8.7-codecs.patch DELETED ---
--- kaffeine-0.8.7-epg.patch DELETED ---
--- kaffeine-0.8.7-optflags.patch DELETED ---
More information about the fedora-extras-commits
mailing list