rpms/kdesvn/F-9 kdesvn-1.2.0-asneeded.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 kdesvn.spec, 1.39, 1.40 sources, 1.19, 1.20 kdesvn-1.0.0-asneeded.patch, 1.1, NONE

Tue Oct 7 22:17:57 UTC 2008

Author: orion

Update of /cvs/pkgs/rpms/kdesvn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16592

Modified Files:
	.cvsignore kdesvn.spec sources 
Added Files:
	kdesvn-1.2.0-asneeded.patch 
Removed Files:
	kdesvn-1.0.0-asneeded.patch 
Log Message:
* Fri Oct 3 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.2.1-1
- Update to 1.2.1


kdesvn-1.2.0-asneeded.patch:

--- NEW FILE kdesvn-1.2.0-asneeded.patch ---
--- kdesvn-kde4-1.2.0.20080926/src/CMakeLists.txt.asneeded	2008-09-25 00:58:23.000000000 -0600
+++ kdesvn-kde4-1.2.0.20080926/src/CMakeLists.txt	2008-09-29 16:30:31.000000000 -0600
@@ -54,7 +54,7 @@
     )
 SET_TARGET_PROPERTIES(kdesvnpart
     PROPERTIES
-    LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} ${LINK_NO_UNDEFINED}")
+    LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} ${LINK_NO_UNDEFINED}")
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src/svnqt)
 
--- kdesvn-kde4-1.2.0.20080926/src/svnqt/CMakeLists.txt.asneeded	2008-09-24 09:40:31.000000000 -0600
+++ kdesvn-kde4-1.2.0.20080926/src/svnqt/CMakeLists.txt	2008-09-29 16:30:31.000000000 -0600
@@ -145,7 +145,7 @@
 
 SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
 SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
-SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
+SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "-Wl,--as-needed ${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
 TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS} ${QT_QTSQL_LIBRARY})
 
 IF (WIN32)
--- kdesvn-kde4-1.2.0.20080926/src/svnqt/cmakemodules/FindSubversion.cmake.asneeded	2008-07-27 16:30:51.000000000 -0600
+++ kdesvn-kde4-1.2.0.20080926/src/svnqt/cmakemodules/FindSubversion.cmake	2008-09-29 16:30:31.000000000 -0600
@@ -58,14 +58,29 @@
     MESSAGE(SEND_ERROR "Error: no apu-config found")
   endif(NOT APU_CONFIG)
 
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR)
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr include: ${APR_INCLUDE_DIR}")
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu include: ${APU_INCLUDE_DIR}")
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr cppflags: ${APR_CPP_FLAGS}")
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu cppflags: ${APU_CPP_FLAGS}")
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APR_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr libs: ${APR_LIBS}")
+  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIBS})
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--ldflags" OUTPUT_VARIABLE APR_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr extra ldflags: ${APR_EXTRA_LDFLAGS}")
+
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APU_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu libs: ${APU_LIBS}")
+  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIBS})
 
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS)
-
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS)
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--ldflags" OUTPUT_VARIABLE APU_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu extra ldflags: ${APU_EXTRA_LIBS}")
 
   CHECK_INCLUDE_FILES(execinfo.h HAS_BACKTRACE_H)
 
@@ -180,8 +195,10 @@
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  SET(APR_EXTRA_LIBFLAGS )
-  SET(APU_EXTRA_LIBFLAGS )
+  SET(APR_EXTRA_LIBS )
+  SET(APR_EXTRA_LDFLAGS )
+  SET(APU_EXTRA_LIBS )
+  SET(APU_EXTRA_LDFLAGS )
 
 
   # check found libraries
@@ -189,7 +206,7 @@
     MESSAGE(SEND_ERROR "No apr lib found!")
   ELSE (NOT APR_LIB)
     MESSAGE(STATUS "Found apr lib: ${APR_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB})
+    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB} ${APR_EXTRA_LIBS})
   endif(NOT APR_LIB)
 
   if (NOT APRICONV_LIB)
@@ -203,7 +220,7 @@
     MESSAGE(SEND_ERROR "No aprutil lib found!")
   ELSE (NOT APU_LIB)
     MESSAGE(STATUS "Found aprutil lib: ${APU_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB})
+    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB} ${APU_EXTRA_LIBS})
   endif(NOT APU_LIB)
 
   if (NOT APU_XMLLIB)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	29 Sep 2008 20:08:43 -0000	1.19
+++ .cvsignore	7 Oct 2008 22:17:27 -0000	1.20
@@ -1 +1 @@
-kdesvn-1.0.2.tar.bz2
+kdesvn-1.2.1.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-9/kdesvn.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdesvn.spec	29 Sep 2008 20:08:43 -0000	1.39
+++ kdesvn.spec	7 Oct 2008 22:17:27 -0000	1.40
@@ -1,18 +1,17 @@
 Name:           kdesvn
-Version:        1.0.2
+Version:        1.2.1
 Release:        1%{?dist}
-Summary:        A subversion client for KDE with KIO integration
+Summary:        A subversion client for KDE4 with KIO integration
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://kdesvn.alwins-world.de/
 Source0:        http://kdesvn.alwins-world.de/downloads/kdesvn-%{version}.tar.bz2
 #Reported upstream: http://kdesvn.alwins-world.de/trac.fcgi/ticket/246
-Patch0:         kdesvn-1.0.0-asneeded.patch
+Patch0:         kdesvn-1.2.0-asneeded.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  subversion-devel, kdelibs3-devel, neon-devel, cmake, gettext
-BuildRequires:  sqlite-devel
+BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, cmake, gettext
 BuildRequires:  desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -45,34 +44,30 @@
 
 
 %build
-mkdir kdesvn-build
-cd kdesvn-build
+mkdir -p %{_target_platform}
+cd %{_target_platform}
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-%cmake .. \
+%{cmake_kde4} .. \
        -DCMAKE_BUILD_TYPE=Release
 make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd kdesvn-build
+pushd %{_target_platform}
 make install VERBOSE=1 DESTDIR=$RPM_BUILD_ROOT
+popd
 
 # Desktop file
-cd ..
 desktop-file-install --vendor=fedora \
-       --add-category=Qt \
-       --add-category=KDE \
        --add-category=Application \
-       --add-category=Development \
-       --add-category=X-Fedora \
-       --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-       $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
+       --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
+       $RPM_BUILD_ROOT%{_datadir}/applications/kde4/%{name}.desktop
 %find_lang %{name} || touch %{name}.lang
 
-#Don't conflict with kdebase
-rm $RPM_BUILD_ROOT%{_datadir}/services/svn*.protocol
+#Don't conflict with kdesdk
+rm $RPM_BUILD_ROOT%{_datadir}/kde4/services/svn*.protocol
 
 
 %clean
@@ -81,19 +76,11 @@
 
 %post
 /sbin/ldconfig
-update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+xdg-icon-resource forceupdate --theme hicolor
 
 %postun
 /sbin/ldconfig
-update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+xdg-icon-resource forceupdate --theme hicolor
 
 
 %files -f %{name}.lang
@@ -101,29 +88,34 @@
 %doc AUTHORS ChangeLog COPYING GPL.txt
 %{_bindir}/kdesvn
 %{_bindir}/kdesvnaskpass
-%{_libdir}/kde3/*
-%{_libdir}/libsvnqt.so.*
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/apps/kconf_update/
-%{_datadir}/apps/kdesvn/
-%{_datadir}/apps/kdesvnpart/
-%{_datadir}/apps/konqueror/servicemenus/kdesvn*.desktop
+%{_libdir}/kde4/*
+%{_libdir}/libsvnqt4.so.*
+%{_datadir}/applications/kde4/fedora-%{name}.desktop
+%{_datadir}/kde4/apps/kconf_update/
+%{_datadir}/kde4/apps/kdesvn/
+%{_datadir}/kde4/apps/kdesvnpart/
 %{_datadir}/config.kcfg/kdesvn_part.kcfg
+%{_datadir}/dbus-1/interfaces/org.kde.kdesvnd.xml
 %{_datadir}/doc/HTML/*/kdesvn/
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/*/*/*.svgz
-%{_datadir}/services/kded/kdesvnd.desktop
-%{_datadir}/services/ksvn*.protocol
+%{_datadir}/kde4/services/*
 %{_mandir}/man1/kdesvn*.1*
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/svnqt/
-%{_libdir}/libsvnqt.so
+%{_includedir}/svnqt4/
+%{_libdir}/libsvnqt4.so
 
 
 %changelog
+* Fri Oct 3 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.2.1-1
+- Update to 1.2.1
+
+* Mon Sep 29 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.2.0-0.20080926.1
+- Update to 1.2.0.20080926, KDE4 version
+
 * Mon Sep 29 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.2-1
 - Update to 1.0.2
 - Add BR sqlite-devel needed for Qt3 build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	29 Sep 2008 20:08:43 -0000	1.19
+++ sources	7 Oct 2008 22:17:27 -0000	1.20
@@ -1 +1 @@
-b33a98229444a3e81d0335e59927f4cb  kdesvn-1.0.2.tar.bz2
+b387116d611ee0a2ed79133f12d1c826  kdesvn-1.2.1.tar.bz2


--- kdesvn-1.0.0-asneeded.patch DELETED ---


