rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec, 1.10, 1.11

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-7
- -extras: drop --with-musicbrainz (for now)



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kdemultimedia-extras.spec	29 Aug 2006 18:51:11 -0000	1.10
+++ kdemultimedia-extras.spec	26 Sep 2006 18:58:40 -0000	1.11
@@ -22,7 +22,8 @@
 BuildConflicts: akode-extras
 # debugging: to make sure no extras bits (accidentally) get excluded
 %{?debug:BuildConflicts: kdemultimedia-extras = %{epoch}:%{version}}
-%define _with_musicbrainz --with-musicbrainz
+## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
+#define _with_musicbrainz --with-musicbrainz
 %define _with_libsamplerate --with-libsamplerate
 %define _with_taglib --with-taglib
 %endif
@@ -66,7 +67,7 @@
 Epoch:	 6
 #endif
 Version: 3.5.4
-Release: 6%{?dist}%{?kde}
+Release: 7%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"
@@ -273,10 +274,9 @@
 done
 
 #if "%{?juk:1}" == "1"
-desktop-file-install --vendor="fedora" \
-  --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category="X-Fedora" \
+desktop-file-install \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category="X-Fedora" --vendor="" \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop
 #endif
 
@@ -336,6 +336,33 @@
 fi
 
 mv %{name}.lang %{name}.list
+# Handle .la, .so files (v0.6)
+[ ! -f %{name}.list ] && echo "%defattr(-,root,root,-)" > %{name}.list
+[ ! -f devel.list ]  && echo "%defattr(-,root,root,-)" > devel.list
+for solib in ${RPM_BUILD_ROOT}%{_libdir}/*.so* ; do
+  soname=$(basename ${solib})
+  base=$(basename ${soname} .so)
+  if [ -L ${solib} ]; then
+    if [ "${soname}" == "${base}.so" ]; then
+      echo "%{_libdir}/${soname}" >> devel.list
+      if [ -f ${RPM_BUILD_ROOT}%{_libdir}/${base}.la ]; then
+        ## Should be able to omit these, but that's not always true -- Rex
+        #echo "%exclude %{_libdir}/${base}.la" >> devel.list
+        echo "%{_libdir}/${base}.la" >> devel.list
+      fi
+    else
+      echo "%{_libdir}/${soname}" >> %{name}.list
+    fi
+  else
+    if [ -f ${RPM_BUILD_ROOT}%{_libdir}/${base}.la ]; then
+      ## Should be safe since we patched kdelibs, but that not always true (either) -- Rex
+      #echo "%exclude %{_libdir}/${base}.la" >> %{name}.list
+      echo "%{_libdir}/${base}.la" >> %{name}.list
+    fi
+    echo "%{_libdir}/${soname}" >> %{name}.list
+  fi
+done
+
 
 ## remove references to optional external libraries in .la files (#178734)
 # alsa-lib/asound
@@ -351,7 +378,6 @@
 sed -i -e "s@%{_libdir}/libltdl.la@@g" $RPM_BUILD_ROOT%{_libdir}/lib*.la ||:
 
 
-
 %if "%{?core}" == "1"
 %post
 /sbin/ldconfig
@@ -397,9 +423,7 @@
 %files -f %{name}.list
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{_libdir}/libkdeinit_*.so
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
+%{_libdir}/lib*.*
 %{_bindir}/*
 # Own dir(s) until owned by kdelibs? -- Rex
 %{_sysconfdir}/xdg/menus/applications-merged/
@@ -419,8 +443,6 @@
 %files devel 
 %defattr(-,root,root,-)
 %{_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*
 %endif
 
 %if "%{?extras}" == "1"
@@ -447,7 +469,11 @@
 
 
 %changelog
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-7
+- -extras: drop --with-musicbrainz (for now)
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-6
+- try to cleverly move lib*.so bits to -devel (and try to avoid bug #202944)
 - -extras: --with-musicbrainz (using libtunepimp-0.4.x, we'll deal with
   the hairball that is libtunepimp-0.5 later)