rpms/strigi/F-8 strigi-0.5.5-fix-sonames.diff, NONE, 1.1 strigi.spec, 1.8, 1.9

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/strigi/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28184/F-8

Modified Files:
	strigi.spec 
Added Files:
	strigi-0.5.5-fix-sonames.diff 
Log Message:
- Apply plugin soname patch to actually fix dangling symlink issue
- Move ldconfig calls to -libs subpackage

strigi-0.5.5-fix-sonames.diff:

--- NEW FILE strigi-0.5.5-fix-sonames.diff ---
diff -ur strigi-0.5.5/src/streamanalyzer/endplugins/CMakeLists.txt strigi-0.5.5-fix-sonames/src/streamanalyzer/endplugins/CMakeLists.txt
--- strigi-0.5.5/src/streamanalyzer/endplugins/CMakeLists.txt	2007-08-06 00:14:33.000000000 +0200
+++ strigi-0.5.5-fix-sonames/src/streamanalyzer/endplugins/CMakeLists.txt	2007-10-29 22:45:49.000000000 +0100
@@ -15,9 +15,7 @@
   endif(WIN32)
   add_library(${libname} MODULE ${files})
   set_target_properties(${libname} PROPERTIES
-    PREFIX ${prefix}
-    VERSION ${STRIGI_VERSION}
-    SOVERSION ${STRIGI_VERSION_MAJOR})
+    PREFIX ${prefix})
   target_link_libraries(${libname} streamanalyzer)
   install(TARGETS ${libname} LIBRARY DESTINATION ${LIB_DESTINATION}/strigi)
 ENDMACRO(ADD_STRIGIEA)
diff -ur strigi-0.5.5/src/streamanalyzer/lineplugins/CMakeLists.txt strigi-0.5.5-fix-sonames/src/streamanalyzer/lineplugins/CMakeLists.txt
--- strigi-0.5.5/src/streamanalyzer/lineplugins/CMakeLists.txt	2007-08-06 00:14:33.000000000 +0200
+++ strigi-0.5.5-fix-sonames/src/streamanalyzer/lineplugins/CMakeLists.txt	2007-10-29 22:45:59.000000000 +0100
@@ -14,9 +14,7 @@
   endif(WIN32)
   add_library(${libname} MODULE ${files})
   set_target_properties(${libname} PROPERTIES
-    PREFIX ${prefix}
-    VERSION ${STRIGI_VERSION}
-    SOVERSION ${STRIGI_VERSION_MAJOR})
+    PREFIX ${prefix})
   target_link_libraries(${libname} streamanalyzer)
   install(TARGETS ${libname} LIBRARY DESTINATION ${LIB_DESTINATION}/strigi)
 ENDMACRO(ADD_STRIGILA)
diff -ur strigi-0.5.5/src/streamanalyzer/saxplugins/CMakeLists.txt strigi-0.5.5-fix-sonames/src/streamanalyzer/saxplugins/CMakeLists.txt
--- strigi-0.5.5/src/streamanalyzer/saxplugins/CMakeLists.txt	2007-08-06 00:14:33.000000000 +0200
+++ strigi-0.5.5-fix-sonames/src/streamanalyzer/saxplugins/CMakeLists.txt	2007-10-29 22:46:14.000000000 +0100
@@ -14,9 +14,7 @@
   endif(WIN32)
   add_library(${libname} MODULE ${files})
   set_target_properties(${libname} PROPERTIES
-    PREFIX ${prefix}
-    VERSION ${STRIGI_VERSION}
-    SOVERSION ${STRIGI_VERSION_MAJOR})
+    PREFIX ${prefix})
   target_link_libraries(${libname} streamanalyzer)
   install(TARGETS ${libname} LIBRARY DESTINATION ${LIB_DESTINATION}/strigi)
 ENDMACRO(ADD_STRIGILA)
diff -ur strigi-0.5.5/src/streamanalyzer/throughplugins/CMakeLists.txt strigi-0.5.5-fix-sonames/src/streamanalyzer/throughplugins/CMakeLists.txt
--- strigi-0.5.5/src/streamanalyzer/throughplugins/CMakeLists.txt	2007-08-06 00:14:33.000000000 +0200
+++ strigi-0.5.5-fix-sonames/src/streamanalyzer/throughplugins/CMakeLists.txt	2007-10-29 22:46:23.000000000 +0100
@@ -14,9 +14,7 @@
   endif(WIN32)
   add_library(${libname} MODULE ${files})
   set_target_properties(${libname} PROPERTIES
-    PREFIX ${prefix}
-    VERSION ${STRIGI_VERSION}
-    SOVERSION ${STRIGI_VERSION_MAJOR})
+    PREFIX ${prefix})
   target_link_libraries(${libname} streamanalyzer)
   install(TARGETS ${libname} LIBRARY DESTINATION ${LIB_DESTINATION}/strigi)
 ENDMACRO(ADD_STRIGITA)


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-8/strigi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- strigi.spec	29 Oct 2007 19:36:55 -0000	1.8
+++ strigi.spec	29 Oct 2007 21:54:19 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		strigi
 Version:	0.5.5
-Release:	2%{?dist}.1
+Release:	2%{?dist}.2
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -8,6 +8,7 @@
 Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
+Patch0:		strigi-0.5.5-fix-sonames.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -84,9 +85,9 @@
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -110,6 +111,10 @@
 
 %changelog
 * Mon Oct 29 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.5-2.1
+- Apply plugin soname patch to actually fix dangling symlink issue
+- Move ldconfig calls to -libs subpackage
+
+* Mon Oct 29 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.5-2.1
 - Rebuild in an attempt to fix dangling symlinks
 
 * Sun Sep 09 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-2