rpms/kdesvn/F-9 kdesvn-1.0.0-asneeded.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 kdesvn.spec, 1.38, 1.39 sources, 1.18, 1.19 kdesvn-0.14.1-asneeded.patch, 1.1, NONE kdesvn-0.14.1-png.patch, 1.1, NONE

Orion Poplawski orion at fedoraproject.org
Mon Sep 29 20:09:13 UTC 2008 

Author: orion

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

Modified Files:
	.cvsignore kdesvn.spec sources 
Added Files:
	kdesvn-1.0.0-asneeded.patch 
Removed Files:
	kdesvn-0.14.1-asneeded.patch kdesvn-0.14.1-png.patch 
Log Message:
* 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
- Drop png patch applied upstream
- Update asneeded patch
- Handle multiple languages


kdesvn-1.0.0-asneeded.patch:

--- NEW FILE kdesvn-1.0.0-asneeded.patch ---
--- kdesvn-1.0.0/src/CMakeLists.txt.asneeded	2008-06-20 16:27:30.000000000 -0600
+++ kdesvn-1.0.0/src/CMakeLists.txt	2008-08-07 09:16:09.000000000 -0600
@@ -37,7 +37,7 @@
     ${QT_AND_KDECORE_LIBS} ${KDE3_KIO_LIBRARY} ${KDE3_PART_LIBRARY} ${KDE3_UI_LIBRARY} ${KDE3_WALLET_LIBRARY} )
 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-1.0.0/src/svnqt/CMakeLists.txt.asneeded	2008-06-06 08:48:44.000000000 -0600
+++ kdesvn-1.0.0/src/svnqt/CMakeLists.txt	2008-08-07 09:16:09.000000000 -0600
@@ -177,9 +177,8 @@
     SOVERSION ${LIB_MAJOR}
     VERSION ${_soversion})
 
-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(ALL_LINKFLAGS "${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS}")
+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})
 
 IF (SQLITE_FOUND AND NOT QT4_FOUND)
--- kdesvn-1.0.0/src/svnqt/cmakemodules/FindSubversion.cmake.asneeded	2008-07-21 14:32:32.000000000 -0600
+++ kdesvn-1.0.0/src/svnqt/cmakemodules/FindSubversion.cmake	2008-08-07 09:16:09.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)
--- kdesvn-1.0.0/src/kdesvnd/CMakeLists.txt.asneeded	2007-06-10 15:23:29.000000000 -0600
+++ kdesvn-1.0.0/src/kdesvnd/CMakeLists.txt	2008-08-07 09:16:09.000000000 -0600
@@ -23,7 +23,7 @@
 
 SET_TARGET_PROPERTIES(kded_kdesvnd
     PROPERTIES
-    LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} -avoid-version -module")
+    LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} -avoid-version -module")
 
 INSTALL(TARGETS kded_kdesvnd
     RUNTIME DESTINATION ${BIN_INSTALL_DIR}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	19 May 2008 18:03:01 -0000	1.18
+++ .cvsignore	29 Sep 2008 20:08:43 -0000	1.19
@@ -1 +1 @@
-kdesvn-0.14.4.tar.bz2
+kdesvn-1.0.2.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-9/kdesvn.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdesvn.spec	19 May 2008 18:03:01 -0000	1.38
+++ kdesvn.spec	29 Sep 2008 20:08:43 -0000	1.39
@@ -1,17 +1,18 @@
 Name:           kdesvn
-Version:        0.14.4
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
 License:        GPLv2+
-URL:            http://kdesvn.alwins-world.de/trac.fcgi
-Source0:        http://kdesvn.alwins-world.de/trac.fcgi/downloads/kdesvn-%{version}.tar.bz2
-Patch0:         kdesvn-0.14.1-asneeded.patch
-Patch1:         kdesvn-0.14.1-png.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs3-devel, neon-devel, cmake, gettext
+BuildRequires:  sqlite-devel
 BuildRequires:  desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -40,8 +41,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .asneeded
-%patch1 -p1 -b .png
+%patch0 -p1 -b .asneeded
 
 
 %build
@@ -109,7 +109,7 @@
 %{_datadir}/apps/kdesvnpart/
 %{_datadir}/apps/konqueror/servicemenus/kdesvn*.desktop
 %{_datadir}/config.kcfg/kdesvn_part.kcfg
-%{_datadir}/doc/HTML/en/kdesvn/
+%{_datadir}/doc/HTML/*/kdesvn/
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/*/*/*.svgz
 %{_datadir}/services/kded/kdesvnd.desktop
@@ -124,6 +124,19 @@
 
 
 %changelog
+* 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
+
+* Thu Aug 7 2008 - Orion Poplawski <orion at cora.nwra.com> - 1.0.0-1
+- Update to 1.0.0
+- Drop png patch applied upstream
+- Update asneeded patch
+- Handle multiple languages
+
+* Tue Jul 15 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.14.6-1
+- Update to 0.14.6
+
 * Mon May 19 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.14.4-1
 - Update to 0.14.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	19 May 2008 18:03:01 -0000	1.18
+++ sources	29 Sep 2008 20:08:43 -0000	1.19
@@ -1 +1 @@
-70901a2450f74702dff99f7c0fe00a8c  kdesvn-0.14.4.tar.bz2
+b33a98229444a3e81d0335e59927f4cb  kdesvn-1.0.2.tar.bz2


--- kdesvn-0.14.1-asneeded.patch DELETED ---


--- kdesvn-0.14.1-png.patch DELETED ---

More information about the fedora-extras-commits mailing list