rpms/kaffeine/EL-5 .cvsignore, 1.3, 1.4 kaffeine.spec, 1.3, 1.4 sources, 1.3, 1.4

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/kaffeine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17880

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2006 15:12:29 -0000	1.3
+++ .cvsignore	19 Sep 2007 21:16:06 -0000	1.4
@@ -1,2 +1,4 @@
 kaffeine-0.8.2.tar.bz2
 kaffeine-0.8.3.tar.bz2
+kaffeine-0.8.4.tar.bz2
+kaffeine-0.8.5.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/EL-5/kaffeine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kaffeine.spec	29 Nov 2006 18:40:14 -0000	1.3
+++ kaffeine.spec	19 Sep 2007 21:16:06 -0000	1.4
@@ -1,36 +1,27 @@
 
-%if "%{?fedora}" > "2" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define _with_gstreamer --with-gstreamer
-%endif
-
-%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
-%define gst 08 
-BuildRequires: libXtst-devel libXinerama-devel
+BuildRequires: libXext-devel libXinerama-devel libXtst-devel
 %endif
 
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-Version: 0.8.3
-Release: 2%{?dist}
+Version: 0.8.5
+Release: 4%{?dist}
 
-%if "%{?nonfree:1}" == "1"
-Name:    kaffeine-extras-nonfree
-%define  _with_lame --with-lame
-Requires: kaffeine = %{version}
-Patch1: kaffeine-0.8.2-codecs.patch
-# split occurred here
-Conflicts: kaffeine < 0.8.2-2
-%else
+%if "%{?nonfree:1}" != "1"
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
+%else
+Name:    kaffeine-extras-nonfree
 %endif
 
-License: GPL
+License: GPLv2+
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -38,23 +29,19 @@
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
 BuildRequires: xine-lib-devel
-%{!?_without_dvb:BuildRequires: glibc-kernheaders }
-%{?_with_gstreamer:BuildRequires: gstreamer%{?gst}-plugins-devel >= 0.8.7}
-# not included in Extras, disabled
-%{?_with_lame:BuildRequires: lame-devel}
-
-## kdelibs >= 3.5.4 includes x-mplayer2.desktop mimetype
-## everybondy should be using kde >= 3.5.4 by now... (:
-#global kdelibs_ver %(kde-config --version 2>/dev/null | grep '^KDE' | cut -d' ' -f2 | cut -d- -f1)
-#if "%{?kdelibs_ver}" >= "3.5.4"
-%define x_mplayer2_hack 1
-Requires: kdelibs >= 6:3.5.4
-#or
-#Requires: %{_datadir}/mimelnk/application/x-mplayer2.desktop
-#endif
+%if 0%{?fedora} > 7
+BuildRequires: libxcb-devel
+%endif
+# dvb
+BuildRequires: glibc-kernheaders 
+%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
 
 %if "%{?nonfree:1}" == "1" 
-%if "%{?fedora}" > "4"
+Requires: kaffeine = %{version}
+Patch1: kaffeine-0.8.2-codecs.patch
+%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/nonfree codec support
@@ -96,16 +83,17 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-# easier than patching, and using --with-extra-includes=%{_includedir}/cdda below -- Rex
+# easier than patching, and using 
+#  --with-extra-includes=%{_includedir}/cdda below -- Rex
 CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
 
+touch -r acinclude.m4 admin/acinclude.m4.in # avoid autofoo rerun in 0.8.5
+
 %configure \
   --disable-rpath \
-  --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --disable-final \
-  %{?_without_dvb} \
   %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
 
@@ -146,7 +134,7 @@
 
 # Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%{?x_mplayer2_hack:rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop}
+rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
 %endif
 
 
@@ -177,7 +165,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
-%{_libdir}/lib*.so.*
+%{_libdir}/libkaffeineaudioencoder.so.*
+%{_libdir}/libkaffeinedvbplugin.so.*
 %{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
@@ -191,15 +180,38 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkaffeinepart.so
+%{_includedir}/kaffeine/
+%{_libdir}/libkaffeineaudioencoder.so
+%{_libdir}/libkaffeinedvbplugin.so
 %endif
 
 
 %changelog
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-4
+- Avoid autotools re-run after configure (unclean upstream tarball?)
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-2
+- License: GPLv2+
+- BR: libxcb-devel (really)
+
+* Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-1
+- kaffeine-0.8.5
+- BR: libxcb-devel
+
+* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
+- kaffeine-0.8.4 (#243823)
+
+* Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
+- disable gst08 support (for now), it's been orphaned
+
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
+- less globbing in %%files
+
 * Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
-- include libkaffeinepart.so in main pkg (not -devel)
+- include libkaffeinepart.so in main pkg, not -devel (bug #217835)
 
 * Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2006 15:12:29 -0000	1.3
+++ sources	19 Sep 2007 21:16:06 -0000	1.4
@@ -1 +1 @@
-667dd56cf02f1343b3a466a685afdf24  kaffeine-0.8.3.tar.bz2
+71814e7612f1f7e1b6cd954d352e4201  kaffeine-0.8.5.tar.bz2