rpms/kdelibs/devel kdelibs-3.92.0-conflict-kde3.patch, NONE, 1.1.2.1 kdelibs.spec, 1.223.2.9, 1.223.2.10

[Than Ngo (than)]

Author: than

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

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Added Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.92.0-conflict-kde3.patch 
Log Message:
- fix conlict with kde3
- add -DSYSCONF_INSTALL_DIR


kdelibs-3.92.0-conflict-kde3.patch:

--- NEW FILE kdelibs-3.92.0-conflict-kde3.patch ---
--- kdelibs-3.92.0/kdeprint/management/CMakeLists.txt.orig	2007-07-30 17:15:49.000000000 +0200
+++ kdelibs-3.92.0/kdeprint/management/CMakeLists.txt	2007-07-30 17:16:44.000000000 +0200
@@ -65,7 +65,8 @@ kde4_add_library(kdeprint_management SHA
 
 target_link_libraries(kdeprint_management  ${KDE4_KDECORE_LIBS} kdeprint ${KDE4_KDE3SUPPORT_LIBS} )
 
-set_target_properties(kdeprint_management PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+set_target_properties(kdeprint_management PROPERTIES VERSION
+${KDE_NON_GENERIC_LIB_SOVERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
 install(TARGETS kdeprint_management  DESTINATION ${LIB_INSTALL_DIR} )
 
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.9
retrieving revision 1.223.2.10
diff -u -r1.223.2.9 -r1.223.2.10
--- kdelibs.spec	29 Jul 2007 22:57:30 -0000	1.223.2.9
+++ kdelibs.spec	30 Jul 2007 15:45:29 -0000	1.223.2.10
@@ -1,26 +1,24 @@
-
-
-Summary:       K Desktop Environment 4 - Libraries
-Version:       3.92.0
-Release:       1%{?dist}
+Summary: K Desktop Environment 4 - Libraries
+Version: 3.92.0
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 7
-Name:          kdelibs
-Epoch:         6
+Name: kdelibs
+Epoch: 6
 
-Obsoletes:     kdelibs4 < %{version}-%{release}
-Provides:      kdelibs4 = %{version}-%{release}
+Obsoletes: kdelibs4 < %{version}-%{release}
+Provides: kdelibs4 = %{version}-%{release}
 
 %else
-Name:          kdelibs4
-%define        _prefix /opt/kde4
+Name: kdelibs4
+%define _prefix /opt/kde4
 %endif
 
-License:       LGPL
-URL:           http://www.kde.org/
-Group:         System Environment/Libraries
-Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+License: LGPL
+URL: http://www.kde.org/
+Group: System Environment/Libraries
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{_prefix}" != "/usr"
 # macros sensitive to _prefix mods
@@ -34,10 +32,10 @@
 %endif
 
 # use ~/.kde4 instead of ~/.kde
-Patch0:        kdelibs-%{version}-kde4home.diff
-
-Source1:       kde4.sh
-Source2:       kde4.csh
+Patch0: kdelibs-%{version}-kde4home.diff
+Patch1: kdelibs-3.92.0-conflict-kde3.patch
+Source1: kde4.sh
+Source2: kde4.csh
 
 BuildRequires: qt4-devel >= 4.3.0
 %global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
@@ -76,12 +74,12 @@
 Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
 %package devel
-Group:    Development/Libraries
-Summary:  Header files for compiling KDE 4 applications
+Group: Development/Libraries
+Summary: Header files for compiling KDE 4 applications
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
-Provides:  kdelibs4-devel = %{version}-%{release}
+Provides: kdelibs4-devel = %{version}-%{release}
 %endif
 Requires: qt4-devel
 # FIXME/TODO: trim these down  -- Rex
@@ -90,6 +88,7 @@
 Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
 Requires: zlib-devel krb5-devel libattr-devel gamin-devel strigi-devel
 Requires: alsa-lib-devel avahi-devel
+
 %description devel
 This package includes the header files you will need to compile
 applications for KDE 4.
@@ -103,7 +102,7 @@
 %if "%{_prefix}" != "/usr"
 %patch0 -p1 -b .kde4home
 %endif
-
+%patch1 -p1 -b .conflict-kde3
 
 %build
 
@@ -111,6 +110,7 @@
 pushd %{_target_platform} 
 %cmake \
   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+  -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
   ../
 popd
 
@@ -204,6 +204,10 @@
 
 
 %changelog
+* Mon Jul 30 2007 Than Ngo <than at redhat.com> 3.92.0-2
+- fix conlict with kde3
+- add -DSYSCONF_INSTALL_DIR
+
 * Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
 - kde-3.92.0 (kde4-beta1)