rpms/kaffeine/devel .cvsignore, 1.3, 1.4 kaffeine.spec, 1.4, 1.5 sources, 1.3, 1.4

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
- kaffeine-0.8.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Nov 2006 23:57:34 -0000	1.3
+++ .cvsignore	8 Jun 2007 14:40:06 -0000	1.4
@@ -1,2 +1,3 @@
 kaffeine-0.8.2.tar.bz2
 kaffeine-0.8.3.tar.bz2
+kaffeine-0.8.4.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kaffeine.spec	18 Jan 2007 14:22:53 -0000	1.4
+++ kaffeine.spec	8 Jun 2007 14:40:06 -0000	1.5
@@ -1,32 +1,20 @@
 
-%if 0%{?fedora} > 2
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define _with_gstreamer --with-gstreamer
-%endif
-
-%if 0%{?fedora} > 4
-%define gst 08 
-# gstreamer08 has been orphaned
-%undefine _with_gstreamer
 BuildRequires: libXinerama-devel libXtst-devel
 %endif
 
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-Version: 0.8.3
-Release: 4%{?dist}
+Version: 0.8.4
+Release: 1%{?dist}
 
 %if "%{?nonfree:1}" != "1"
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
-
 %else
 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
 %endif
 
 License: GPL
@@ -41,22 +29,17 @@
 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
+# FIXME/TODO: http://xcb.freedesktop.org/
+#BuildRequires: libxcb-devel
+# dvb
+BuildRequires: glibc-kernheaders 
+%{?_with_gstreamer:BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10}
 
 %if "%{?nonfree:1}" == "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
 # can view dvd's if libdvdcss is available
 Requires(hint): libdvdcss
@@ -99,16 +82,15 @@
 %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
 
 %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}
 
@@ -149,7 +131,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
 
 
@@ -202,6 +184,9 @@
 
 
 %changelog
+* Fri Jun 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.4-1
+- kaffeine-0.8.4
+
 * Thu Jan 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.3-4
 - disable gst08 support (for now), it's been orphaned
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Nov 2006 23:57:34 -0000	1.3
+++ sources	8 Jun 2007 14:40:06 -0000	1.4
@@ -1 +1 @@
-667dd56cf02f1343b3a466a685afdf24  kaffeine-0.8.3.tar.bz2
+6f62ebb7a6f88ff49f452856a1660d95  kaffeine-0.8.4.tar.bz2