rpms/kdebindings/devel kdebindings-4.3.85-qyoto_no_examples.patch, NONE, 1.1 .cvsignore, 1.68, 1.69 kdebindings.spec, 1.274, 1.275 sources, 1.76, 1.77 kdebindings-4.3.80-pykdeui-trunk.patch, 1.2, NONE kdebindings-qyoto-examples.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Fri Dec 18 16:51:36 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv961

Modified Files:
	.cvsignore kdebindings.spec sources 
Added Files:
	kdebindings-4.3.85-qyoto_no_examples.patch 
Removed Files:
	kdebindings-4.3.80-pykdeui-trunk.patch 
	kdebindings-qyoto-examples.patch 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- kde-4.3.85 (4.4beta2)


kdebindings-4.3.85-qyoto_no_examples.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebindings-4.3.85-qyoto_no_examples.patch ---
diff -up kdebindings-4.3.85/csharp/plasma/CMakeLists.txt.examples kdebindings-4.3.85/csharp/plasma/CMakeLists.txt
--- kdebindings-4.3.85/csharp/plasma/CMakeLists.txt.examples	2009-12-14 04:43:50.000000000 -0600
+++ kdebindings-4.3.85/csharp/plasma/CMakeLists.txt	2009-12-18 10:48:06.780312525 -0600
@@ -41,4 +41,4 @@ install(FILES ${LIBRARY_OUTPUT_PATH}/Pla
 install(FILES plasma-scriptengine-kimono-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 install(FILES plasma-scriptengine-kimono-dataengine.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 
-add_subdirectory( examples )
+# add_subdirectory( examples )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	1 Dec 2009 15:50:22 -0000	1.68
+++ .cvsignore	18 Dec 2009 16:51:36 -0000	1.69
@@ -1 +1 @@
-kdebindings-4.3.80.tar.bz2
+kdebindings-4.3.85.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -p -r1.274 -r1.275
--- kdebindings.spec	12 Dec 2009 03:33:41 -0000	1.274
+++ kdebindings.spec	18 Dec 2009 16:51:36 -0000	1.275
@@ -1,3 +1,4 @@
+
 # define to enable these optional bits
 ## arch'es matching mono's ExclusiveArch set
 %if 0%{?fedora} > 11
@@ -28,6 +29,7 @@
 %define java 0
 %endif
 
+%define akonadi_version 1.2.80
 %define pykde4_akonadi 1
 %define pyqt4_version 4.6.1
 
@@ -51,8 +53,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.80
-Release: 3%{?dist}
+Version: 4.3.85
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -63,7 +65,7 @@ Source0: ftp://ftp.kde.org/pub/kde/unsta
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # patch to disable examples (trouble with them installing to the buildroot)
-Patch0:  kdebindings-qyoto-examples.patch
+Patch0:  kdebindings-4.3.85-qyoto_no_examples.patch
 # fix build with CMAKE_SKIP_RPATH - also needs sed line below
 # WARNING: This is a bunch of quick hacks to get this to build. Please do not
 #          commit this upstream without further discussion.
@@ -78,10 +80,8 @@ Patch2:  kdebindings-4.3.80-fix-build.pa
 ## upstream patches
 # fix the PyKDE4 kdeui bindings to build
 # http://websvn.kde.org/?view=revision&revision=1060018
-Patch100: kdebindings-4.3.80-pykdeui-trunk.patch
-
 
-BuildRequires:  akonadi-devel >= 1.1.0
+BuildRequires:  akonadi-devel >= %{akonadi_version} 
 BuildRequires:  kdebase-workspace-devel >= %{version}
 # okular bindings
 BuildRequires:  kdegraphics-devel >= %{version}
@@ -284,11 +284,11 @@ Falcon plugin for the Kross archtecture 
 
 %prep
 %setup -q -n kdebindings-%{version}%{?alphatag}
-%patch0
-%patch2 -p1 -b .fix-build
+%patch0 -p1 -b .qyoto_no_examples
+## please please "just work" -- Rex
+#patch2 -p1 -b .fix-build
 
 # upstream patches
-%patch100 -p0 -b .pykdeui-trunk
 
 # do the no-rpath hack last, after the upstream backports (if any)
 %patch1 -p1 -b .no-rpath
@@ -555,6 +555,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
 * Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
 - fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)
 - fix the PyKDE4 Akonadi, kdeui and Phonon bindings to build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	4 Dec 2009 15:30:19 -0000	1.76
+++ sources	18 Dec 2009 16:51:36 -0000	1.77
@@ -1 +1 @@
-3fd12db9000aa2c11e8812182d7a0820  kdebindings-4.3.80.tar.bz2
+6c25d465c2544a199273975686ea8285  kdebindings-4.3.85.tar.bz2


--- kdebindings-4.3.80-pykdeui-trunk.patch DELETED ---


--- kdebindings-qyoto-examples.patch DELETED ---




More information about the scm-commits mailing list