rpms/kdesdk/F-7 kdesdk-3.5.7-subversion.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 kdesdk.spec, 1.71, 1.72 sources, 1.35, 1.36
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Nov 1 16:04:44 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdesdk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26453
Modified Files:
.cvsignore kdesdk.spec sources
Added Files:
kdesdk-3.5.7-subversion.patch
Log Message:
sync w/devel (kde-3.5.8)
kdesdk-3.5.7-subversion.patch:
--- NEW FILE kdesdk-3.5.7-subversion.patch ---
diff -up kdesdk-3.5.7/kioslave/svn/configure.in.in.svn kdesdk-3.5.7/kioslave/svn/configure.in.in
--- kdesdk-3.5.7/kioslave/svn/configure.in.in.svn 2005-10-10 09:58:25.000000000 -0500
+++ kdesdk-3.5.7/kioslave/svn/configure.in.in 2007-09-12 09:39:42.000000000 -0500
@@ -86,7 +86,7 @@ fi
AC_SUBST(SVNCONFIG)
if test -x "$SVNCONFIG"; then
SVNLD="`$SVNCONFIG --ldflags`"
- SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
+ SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1 -lsvn_subr-1"
SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
@@ -141,7 +141,7 @@ dnl AC_MSG_ERROR([Subversion headers ar
SVN_SUBDIR=
fi
fi
-SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
+SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1 -lsvn_subr-1"
SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-7/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore 11 Jun 2007 19:53:29 -0000 1.33
+++ .cvsignore 1 Nov 2007 16:04:11 -0000 1.34
@@ -1 +1,2 @@
kdesdk-3.5.7.tar.bz2
+kdesdk-3.5.8.tar.bz2
Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-7/kdesdk.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kdesdk.spec 24 Jul 2007 22:15:13 -0000 1.71
+++ kdesdk.spec 1 Nov 2007 16:04:11 -0000 1.72
@@ -1,39 +1,44 @@
-%define debug 0
-%define final 0
+%define _with_subversion --with-subversion --with-apr-config=apr-1-config --with-apu-config=apu-1-config
-%define qt_version 3.3.8
-%define qt_epoch 1
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
-%define arts 1
+%define make_cvs 1
-%define make_cvs 1
-
-%define appdir %{_datadir}/applications/kde
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
Name: kdesdk
Summary: The KDE Software Development Kit (SDK)
-Version: 3.5.7
-Release: 7%{?dist}
+Version: 3.5.8
+Release: 2%{?dist}
-License: GPL
+License: GPLv2
Group: User Interface/Desktops
URL: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch1: kdesdk-3.4.0-db4.patch
+
+Patch1: kdesdk-3.5.7-subversion.patch
Patch2: kdesdk-3.5.4-multilib.patch
+Provides: kdesdk3 = %{version}-%{release}
+
+%if 0%{?libs}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
+%endif
%if %{make_cvs}
BuildRequires: automake libtool
%endif
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
# for kbugbuster/libkcal
-BuildRequires: kdepim-devel
+BuildRequires: kdepim3-devel
BuildRequires: db4-devel
BuildRequires: desktop-file-utils
# kbabel, F-7+: flex >= 2.5.33-9
@@ -44,28 +49,54 @@
BuildRequires: binutils-devel
%endif
BuildRequires: perl
-BuildRequires: subversion-devel >= 1.0, neon-devel
+%{?_with_subversion:BuildRequires: subversion-devel neon-devel}
+
+# Obsoletes/Provides
+%define cervisia_ver 2.4.7
+Provides: cervisia = %{cervisia_ver}-%{release}
+
+%define umbrello_ver 1.5.7
+Obsoletes: umbrello < %{umbrello_ver}-%{release}
+Provides: umbrello = %{umbrello_ver}-%{release}
+
%description
-A collection of applications and tools used by KDE developers.
-Among other things, kdesdk provides tools for working on the KDE CVS
-repository.
+A collection of applications and tools used by developers, including:
+* cervisia: a CVS frontend
+* kbabel: PO file management
+* kbugbuster: a tool to manage the KDE bug report system
+* kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
+* kompare: diff tool
+* kuiviewer: displays designer's UI files
+* umbrello: UML modeller and UML diagram tool
%package devel
-Summary: Development files for kdesdk
+Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: kdelibs-devel => %{kdelibs_epoch}:%{version}
-
+Provides: kdesdk3-devel = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires: kdelibs3-devel
%description devel
-Development files for kdesdk. Install kdesdk-devel if you wish
-to develop or compile KDE sdk applications.
+%{summary}.
+
+%if 0%{?libs}
+%package libs
+Summary: %{name} runtime libraries
+Group: System Environment/Libraries
+Requires: kdelibs3 >= %{version}
+# helps multilib upgrades
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description libs
+%{summary}.
+%endif
%prep
%setup -q
-%patch1 -p1 -b .db4
+%patch1 -p1 -b .subversion
%patch2 -p1 -b .multilib
%if %{make_cvs}
@@ -77,20 +108,12 @@
unset QTDIR && . /etc/profile.d/qt.sh
%configure \
- --enable-new-ldflags \
- --disable-dependency-tracking \
- --disable-rpath \
-%if %{arts} == 0
- --without-arts \
-%endif
-%if %{debug} == 0
- --disable-debug \
- --disable-warnings \
-%endif
-%if %{final}
- --enable-final \
-%endif
- --includedir=%{_includedir}/kde
+ --includedir=%{_includedir}/kde \
+ --disable-rpath \
+ --enable-new-ldflags \
+ --disable-debug --disable-warnings \
+ --disable-dependancy-tracking --enable-final \
+ %{?_with_subversion}
make %{?_smp_mflags}
@@ -100,14 +123,11 @@
make install DESTDIR=%{buildroot}
-desktop-file-install --vendor "" --delete-original \
- --dir %{buildroot}%{appdir} \
- --add-only-show-in KDE \
- %{buildroot}%{appdir}/kbugbuster.desktop \
- %{buildroot}%{appdir}/kuiviewer.desktop
+desktop-file-install --vendor "" \
+ --dir %{buildroot}%{_datadir}/applications/kde \
+ %{buildroot}%{_datadir}/applications/kde/*.desktop \
# make symlinks relative
-mkdir -p %{buildroot}%{_docdir}/HTML/en/common
pushd %{buildroot}%{_docdir}/HTML/en
for i in *; do
if [ -d $i -a -L $i/common ]; then
@@ -132,7 +152,7 @@
fi
%post
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
for f in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -140,22 +160,24 @@
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
for f in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
%files
%defattr(-,root,root,-)
-%{_docdir}/HTML/en/*
%{_bindir}/*
-%{_libdir}/kde3/*
-%{_libdir}/*.so.*
-%{_libdir}/libkdeinit_*.so
-%{_libdir}/*.la
+%{_docdir}/HTML/en/*
%{_datadir}/apps/*
%{_datadir}/mimelnk/application/*
%{_datadir}/services/*
@@ -165,17 +187,49 @@
%{_datadir}/icons/locolor/*/*/*
%{_datadir}/applications/kde/*
%{_datadir}/config.kcfg/*
+%{_libdir}/kde3/*
+%{_libdir}/libkdeinit_*.so
+%{_mandir}/man1/*
+
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
%files devel
%defattr(-,root,root,-)
%{_includedir}/kde/*
-%{_libdir}/*.so
+%{_libdir}/lib*.so
%exclude %{_libdir}/libkdeinit_*.so
-%{_libdir}/*.a
-%{_mandir}/man1/*
+%{_libdir}/libktrace_s.a
%changelog
+* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-2
+- -libs: Obsoletes: %%name ... to help out multilib upgrades
+- -libs conditional (f8+)
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-1
+- kde-3.5.8
+- libs subpkg (more multilib friendly)
+
+* Wed Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-10
+- update %%description to mention included apps
+- move manpages to main pkg.
+- Provides: cervisia umbrello
+- kbugbuster kuiviewer: drop --add-only-show-in KDE
+- kioslave/svn: --with-subversion, patch
+
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-9
+- License: GPLv2
+- (Build)Requires: kdelibs3(-devel) kdepim3-devel
+- Provides: kdesdk3(-devel)
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.5.7-8
+- Rebuild for selinux ppc32 issue.
+
* Fri Jul 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-7
- don't use %%pretrans (#249374)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-7/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 11 Jun 2007 19:53:29 -0000 1.35
+++ sources 1 Nov 2007 16:04:11 -0000 1.36
@@ -1 +1 @@
-6a8f7b7fea753e2a4517301dee76d84a kdesdk-3.5.7.tar.bz2
+c809c15eb8c09a7eb2d070395202910b kdesdk-3.5.8.tar.bz2
More information about the fedora-extras-commits
mailing list