rpms/kdelibs/F-8 kdelibs-3.5.9-fix-flock-redefinition.patch, NONE, 1.1 .cvsignore, 1.42, 1.43 kdelibs.spec, 1.252, 1.253 sources, 1.53, 1.54 kdelibs-3.5.6-137675.patch, 1.1, NONE
Kevin Kofler
kkofler at fedoraproject.org
Tue Sep 2 17:17:34 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdelibs/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31050/F-8
Modified Files:
.cvsignore kdelibs.spec sources
Added Files:
kdelibs-3.5.9-fix-flock-redefinition.patch
Removed Files:
kdelibs-3.5.6-137675.patch
Log Message:
Sync from kdelibs3/devel:
* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
- kde-3.5.10
* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-18
- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-17
- fix logic error in OnlyShowIn=KDE3 patch
* Wed Jul 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-16
- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243)
* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-15
- set include_crystalsvg to 1 everywhere
- use Epoch 1 for crystalsvg-icon-theme, add Obsoletes
* Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-14
- revert kdeui symlink hack (there be dragons)
- unbreak -apidocs, add %%check so this never ever happens again
* Sat May 24 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-13
- f9+: include kdeui symlink here + scriptlets to help rpm handle it
* Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-12
- f9+: omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (rh#447965, kde#157850)
* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-11
- (Only|Not)ShowIn=KDE3 patch (helps #446466)
* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-10
- fix kresources.desktop: NoDisplay=true
* Mon Apr 14 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-8
- omit Requires: kdndsd-avahi (#441222)
* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-7
- more qt->qt3 fixes
* Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-6
- s/qt-devel/qt3-devel/
kdelibs-3.5.9-fix-flock-redefinition.patch:
--- NEW FILE kdelibs-3.5.9-fix-flock-redefinition.patch ---
diff -ur kdelibs-3.5.9/kio/kio/kdirwatch.cpp kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp
--- kdelibs-3.5.9/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200
+++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp 2008-08-23 00:59:17.000000000 +0200
@@ -71,7 +71,11 @@
#include <linux/types.h>
// Linux kernel headers are documented to not compile
#define _S390_BITOPS_H
+#define flock linux_flock
+#define flock64 linux_flock64
#include <linux/inotify.h>
+#undef flock
+#undef flock64
static inline int inotify_init (void)
{
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-8/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore 14 Feb 2008 17:05:34 -0000 1.42
+++ .cvsignore 2 Sep 2008 17:17:04 -0000 1.43
@@ -1 +1 @@
-kdelibs-3.5.9.tar.bz2
+kdelibs-3.5.10.tar.bz2
Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-8/kdelibs.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- kdelibs.spec 10 Mar 2008 18:54:22 -0000 1.252
+++ kdelibs.spec 2 Sep 2008 17:17:04 -0000 1.253
@@ -1,19 +1,27 @@
# kdelibs3 review: http://bugzilla.redhat.com/248899
+%define _default_patch_fuzz 2
+
%define distname "Fedora"
%define kde_settings 1
%define arts 1
-%define arts_epoch 8
-%define arts_version 1.5.9
+%define arts_ev 8:1.5.9
-%define qt_epoch 1
-%define qt_version 3.3.8b
+%if 0%{?fedora} > 8
+%define qt3 qt3
+%else
+%define qt3_epoch 1:
+%define qt3 qt
+%endif
+%define qt3_version 3.3.8b
+%define qt3_ev %{?qt3_epoch}%{qt3_version}
# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
-#global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
-%define qt_ver %{qt_version}
-%define qtdocdir %{_docdir}/qt-devel-%{qt_ver}
+#global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
+%define qt3_ver %{qt3_version}
+# fix this?... -- Rex
+%define qt3_docdir %{_docdir}/qt-devel-%{qt3_ver}
%define kde_major_version 3
@@ -21,20 +29,26 @@
%define apidocs 1
+# We always include this here now because kdeartwork 4 has moved on to
+# icon-naming-spec names (partially, so the icon theme isn't usable with KDE 4
+# yet either). Maybe the conditional should be dropped entirely? -- Kevin
+%define include_crystalsvg 1
+
Summary: K Desktop Environment 3 - Libraries
-Version: 3.5.9
-Release: 5%{?dist}
+Version: 3.5.10
+Release: 1%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs3
Obsoletes: kdelibs < 6:%{version}-%{release}
Provides: kdelibs = 6:%{version}-%{release}
+# define to enable kdeui symlink hack -- Rex
+#define kdeui_symlink 1
%else
Name: kdelibs
Epoch: 6
Obsoletes: kdelibs3 < %{version}-%{release}
Provides: kdelibs3 = %{version}-%{release}
-%define include_crystalsvg 1
%endif
License: LGPLv2
@@ -68,21 +82,24 @@
Patch49: kdelibs-3.5.8-kspell2-enchant.patch
Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
Patch51: kdelibs-3.5.9-cupsserverbin.patch
+# initial support for (Only|Not)ShowIn=KDE3
+Patch52: kdelibs-3.5.9-KDE3.patch
+# use /usr/libexec/kde4/drkonqi in KCrash (#453243)
+Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
+# fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
+Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
# use /etc/kde in addition to /usr/share/config, borrowed from debian
Patch100: kdelibs-3.5.5-kstandarddirs.patch
# http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
Patch101: kde-3.5-libtool-shlibext.patch
-# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
-Patch102: kdelibs-3.5.6-137675.patch
# kget ignores simultaneous download limit (kde #101956)
Patch103: kdelibs-3.5.0-101956.patch
## upstream patches
-Patch200: kdelibs-3.5.9-kate-regression.patch
-%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
-Requires: qt >= %{qt_epoch}:%{qt_ver}
+#{?arts:Requires: arts >= %{arts_ev}}
+#Requires: %{qt3} >= %{qt3_ev}
Requires: hicolor-icon-theme
%if %{kde_settings}
Requires: kde-settings >= 3.5
@@ -98,7 +115,8 @@
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
%define libkdnssd libkdnssd
-Requires: %{libkdnssd}
+# omit for now, may contribute to http://bugzilla.redhat.com/441222
+#Requires: %{libkdnssd}
%define BuildRequires: xorg-x11-proto-devel libX11-devel
%define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
Requires: iceauth
@@ -108,11 +126,16 @@
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
+%if 0%{?kdeui_symlink}
+# for %_kde4_* macros
+BuildRequires: kde4-macros(api)
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+%endif
BuildRequires: gettext
BuildRequires: pcre-devel
BuildRequires: cups-devel cups
-BuildRequires: qt-devel qt-devel-docs
-%{?arts:BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}}
+BuildRequires: %{qt3}-devel %{qt3}-devel-docs
+%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
BuildRequires: flex >= 2.5.4a-13
BuildRequires: doxygen
BuildRequires: libxslt-devel
@@ -164,9 +187,10 @@
%endif
%if 0%{?include_crystalsvg}
-Provides: crystalsvg-icon-theme = %{version}-%{release}
+Provides: crystalsvg-icon-theme = 1:%{version}-%{release}
+Obsoletes: crystalsvg-icon-theme < 1:%{version}-%{release}
%else
-# this Requires could be made unconditional -- Rex
+# for bootstrapping kde3, omit Requires: crystalsvg... -- Rex
Requires: crystalsvg-icon-theme
%endif
@@ -189,7 +213,7 @@
Provides: kdelibs-devel = 6:%{version}-%{release}
%endif
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: qt-devel
+Requires: %{qt3}-devel
Requires: openssl-devel
%{?arts:Requires: arts-devel}
%{?libkdnssd:Requires: libkdnssd-devel}
@@ -239,13 +263,16 @@
%patch50 -p1 -b .no-ispell
%endif
%patch51 -p1 -b .cupsserverbin
+%patch52 -p1 -b .KDE3
+%if "%{name}" != "kdelibs"
+%patch53 -p1 -b .drkonqi-kde4
+%endif
+%patch54 -p1 -b .flock-redefinition
%patch100 -p1 -b .kstandarddirs
%patch101 -p1 -b .libtool-shlibext
-%patch102 -p0 -b .kde#137675
# upstream patches
-%patch200 -p1 -b .kate-regression
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
@@ -257,7 +284,7 @@
%build
unset QTDIR && . /etc/profile.d/qt.sh
-export QTDOC=%{qtdocdir}
+export QTDOC=%{qt3_docdir}
if [ -x /etc/profile.d/krb5.sh ]; then
. /etc/profile.d/krb5.sh
@@ -300,7 +327,7 @@
make %{?_smp_mflags}
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
make %{?_smp_mflags} apidox
%endif
@@ -313,7 +340,7 @@
chmod a+x %{buildroot}%{_libdir}/*
install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
pushd %{buildroot}%{_docdir}
ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
popd
@@ -422,8 +449,15 @@
rm -rf %{buildroot}%{_datadir}/locale/all_languages
rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
rm -rf %{buildroot}%{_datadir}/autostart/
-# make kresources hidden
-echo "Hidden=true;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
+# don't show kresources
+sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop
+
+%if 0%{?kdeui_symlink}
+# kdeui for kde3, kinda workaround http://bugs.kde.org/157850
+# and save space by sharing
+rm -rf %{buildroot}%{_datadir}/apps/kdeui/
+ln -s %{_kde4_appsdir}/kdeui %{buildroot}%{_datadir}/apps/kdeui
+%endif
%endif
%if 0%{?include_crystalsvg} == 0
@@ -432,6 +466,17 @@
%endif
+%check
+ERROR=0
+%if 0%{?apidocs}
+if [ ! -f %{buildroot}%{_docdir}/HTML/en/kdelibs-apidocs/index.html ]; then
+ echo "ERROR: %{_docdir}/HTML/en/kdelibs-apidocs/index.html not generated"
+ ERROR=1
+fi
+%endif
+exit $ERROR
+
+
%clean
rm -rf %{buildroot}
@@ -443,6 +488,13 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
%endif
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
+%if 0%{?kdeui_symlink}
+rm -rf %{_datadir}/apps/kdeui.rpm_remove ||:
+
+%pre
+test -d %{_datadir}/apps/kdeui -a ! -L %{_datadir}/apps/kdeui && \
+ mv %{_datadir}/apps/kdeui %{_datadir}/apps/kdeui.rpm_remove ||:
+%endif
%postun
/sbin/ldconfig
@@ -564,7 +616,7 @@
%{_libdir}/lib*.a
%exclude %{_libdir}/libkdeinit_*.so
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
%files apidocs
%defattr(-,root,root,-)
%{_docdir}/%{name}-devel-%{kde_major_version}
@@ -573,6 +625,47 @@
%changelog
+* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
+- kde-3.5.10
+
+* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-18
+- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
+
+* Fri Aug 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-17
+- fix logic error in OnlyShowIn=KDE3 patch
+
+* Wed Jul 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-16
+- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243)
+
+* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.9-15
+- set include_crystalsvg to 1 everywhere
+- use Epoch 1 for crystalsvg-icon-theme, add Obsoletes
+
+* Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-14
+- revert kdeui symlink hack (there be dragons)
+- unbreak -apidocs, add %%check so this never ever happens again
+
+* Sat May 24 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-13
+- f9+: include kdeui symlink here + scriptlets to help rpm handle it
+
+* Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-12
+- f9+: omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (rh#447965, kde#157850)
+
+* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-11
+- (Only|Not)ShowIn=KDE3 patch (helps #446466)
+
+* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-10
+- fix kresources.desktop: NoDisplay=true
+
+* Mon Apr 14 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-8
+- omit Requires: kdndsd-avahi (#441222)
+
+* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-7
+- more qt->qt3 fixes
+
+* Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-6
+- s/qt-devel/qt3-devel/
+
* Mon Mar 10 2008 Than Ngo <than at redhat.com> 3.5.9-5
- apply upstream patch to fix regression in kate (bz#436384)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-8/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources 14 Feb 2008 17:05:34 -0000 1.53
+++ sources 2 Sep 2008 17:17:04 -0000 1.54
@@ -1 +1 @@
-55e5f00874933d1a7ba7c95e369a205e kdelibs-3.5.9.tar.bz2
+43cd55ed15f63b5738d620ef9f9fd568 kdelibs-3.5.10.tar.bz2
--- kdelibs-3.5.6-137675.patch DELETED ---
More information about the fedora-extras-commits
mailing list