rpms/kaffeine/devel kaffeine.spec,1.2,1.3

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Nov 29 18:15:25 UTC 2006


Author: rdieter

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

Modified Files:
	kaffeine.spec 
Log Message:
* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
- include libkaffeinepart.so in main pkg (not -devel)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kaffeine.spec	26 Nov 2006 23:57:34 -0000	1.2
+++ kaffeine.spec	29 Nov 2006 18:14:55 -0000	1.3
@@ -12,7 +12,7 @@
 #define nonfree 1
 
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
@@ -34,7 +34,6 @@
 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
@@ -125,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} 
@@ -184,6 +178,7 @@
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
 %{_libdir}/lib*.so.*
+%{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
 %{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
@@ -198,10 +193,14 @@
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
 %endif
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- include libkaffeinepart.so in main pkg (not -devel)
+
 * Sun Nov 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3
 




More information about the scm-commits mailing list