rpms/kaffeine/FC-6 .cvsignore, 1.2, 1.3 kaffeine.spec, 1.1, 1.2 sources, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9830

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
- 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2006 04:11:06 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:12:29 -0000	1.3
@@ -1 +1,2 @@
 kaffeine-0.8.2.tar.bz2
+kaffeine-0.8.3.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-6/kaffeine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kaffeine.spec	14 Nov 2006 04:11:06 -0000	1.1
+++ kaffeine.spec	28 Nov 2006 15:12:29 -0000	1.2
@@ -11,33 +11,29 @@
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-%if "%{?nonfree:1}" == "1"
+Version: 0.8.3
+Release: 1%{?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
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
 %endif
 
-Version: 0.8.2
-Release: 5%{?dist}
-
 License: GPL
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source:  http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: desktop-file-utils
 BuildRequires: kdelibs-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
@@ -108,7 +104,7 @@
   --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
+  --disable-dependency-tracking --disable-final \
   %{?_without_dvb} \
   %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
@@ -128,11 +124,6 @@
 %else
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --vendor="" \
-  --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} 
@@ -205,6 +196,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
+- 0.8.3
+
 * Sat Nov 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-6
 - %%doc README
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2006 04:11:06 -0000	1.2
+++ sources	28 Nov 2006 15:12:29 -0000	1.3
@@ -1 +1 @@
-bfb57b62fa72267cc5b01ce9b037cb41  kaffeine-0.8.2.tar.bz2
+667dd56cf02f1343b3a466a685afdf24  kaffeine-0.8.3.tar.bz2