rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement-0.1-soname.patch, NONE, 1.1 kde-plasma-networkmanagement.spec, 1.7, 1.8

Kevin Kofler kkofler at fedoraproject.org
Thu May 21 02:42:03 UTC 2009


Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20413/devel

Modified Files:
	kde-plasma-networkmanagement.spec 
Added Files:
	kde-plasma-networkmanagement-0.1-soname.patch 
Log Message:
* Thu May 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1-0.13.20090519svn
- Give the internal libs sonames independent of the KDE version (fix F12 build)

kde-plasma-networkmanagement-0.1-soname.patch:

--- NEW FILE kde-plasma-networkmanagement-0.1-soname.patch ---
diff -ur kde-plasma-networkmanagement-0.1/libs/dbus/CMakeLists.txt kde-plasma-networkmanagement-0.1-soname/libs/dbus/CMakeLists.txt
--- kde-plasma-networkmanagement-0.1/libs/dbus/CMakeLists.txt	2008-11-06 01:16:33.000000000 +0100
+++ kde-plasma-networkmanagement-0.1-soname/libs/dbus/CMakeLists.txt	2009-05-21 04:36:19.000000000 +0200
@@ -15,8 +15,8 @@
 target_link_libraries(knmdbus ${KDE4_KDECORE_LIBS} solidcontrol)
 
 set_target_properties(knmdbus PROPERTIES
-   VERSION ${GENERIC_LIB_VERSION}
-   SOVERSION ${GENERIC_LIB_SOVERSION}
+   VERSION "4.2.0"
+   SOVERSION 4
    )
 
 install(TARGETS knmdbus ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -ur kde-plasma-networkmanagement-0.1/libs/storage/CMakeLists.txt kde-plasma-networkmanagement-0.1-soname/libs/storage/CMakeLists.txt
--- kde-plasma-networkmanagement-0.1/libs/storage/CMakeLists.txt	2009-02-03 18:41:41.000000000 +0100
+++ kde-plasma-networkmanagement-0.1-soname/libs/storage/CMakeLists.txt	2009-05-21 04:36:31.000000000 +0200
@@ -69,8 +69,8 @@
 target_link_libraries(knmstorage ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} solidcontrol ${QT_QTNETWORK_LIBRARY})
 
 set_target_properties(knmstorage PROPERTIES
-   VERSION ${GENERIC_LIB_VERSION}
-   SOVERSION ${GENERIC_LIB_SOVERSION}
+   VERSION "4.2.0"
+   SOVERSION 4
    )
 install(TARGETS knmstorage ${INSTALL_TARGETS_DEFAULT_ARGS})
 
diff -ur kde-plasma-networkmanagement-0.1/libs/ui/CMakeLists.txt kde-plasma-networkmanagement-0.1-soname/libs/ui/CMakeLists.txt
--- kde-plasma-networkmanagement-0.1/libs/ui/CMakeLists.txt	2009-02-03 11:56:26.000000000 +0100
+++ kde-plasma-networkmanagement-0.1-soname/libs/ui/CMakeLists.txt	2009-05-21 04:36:49.000000000 +0200
@@ -61,8 +61,8 @@
 target_link_libraries(knmui knmstorage ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} solidcontrol)
 
 set_target_properties(knmui PROPERTIES
-   VERSION ${GENERIC_LIB_VERSION}
-   SOVERSION ${GENERIC_LIB_SOVERSION}
+   VERSION "4.2.0"
+   SOVERSION 4
    )
 install(TARGETS knmui ${INSTALL_TARGETS_DEFAULT_ARGS})
 


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- kde-plasma-networkmanagement.spec	21 May 2009 02:18:25 -0000	1.7
+++ kde-plasma-networkmanagement.spec	21 May 2009 02:41:33 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           kde-plasma-networkmanagement
 Version:        0.1
-Release:        0.12.20090519svn%{?dist}
+Release:        0.13.20090519svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          User Interface/Desktops
@@ -11,6 +11,9 @@ URL:            http://websvn.kde.org/tr
 #  svn export -r 970021 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
 #  tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
+# Give the internal libs predictable sonames (not depending on the KDE version
+# this happens to have been built against).
+Patch0:         kde-plasma-networkmanagement-0.1-soname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-workspace-devel >= 4.1.96
@@ -81,6 +84,7 @@ Provides:       knetworkmanager-vpnc = 1
 
 %prep
 %setup -q
+%patch0 -p1 -b .soname
 
 
 %build
@@ -151,8 +155,11 @@ xdg-icon-resource forceupdate --theme ox
 
 
 %changelog
+* Thu May 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1-0.13.20090519svn
+- Give the internal libs sonames independent of the KDE version (fix F12 build)
+
 * Wed May 20 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.12.20090519svn
-- New snapshot (revision 970021 committed 2009-05-19 09:34:14 -0400)
+- New snapshot (revision 970021 committed 2009-05-19 13:34 UTC)
 
 * Tue May 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1-0.11.20090504svn
 - New snapshot (revision 963263 committed 2009-05-04 10:57 UTC)




More information about the fedora-extras-commits mailing list