* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-16

- undo kdelibs3 rename (for now, anyway)
- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
  ksvgtopng, kunittestmodrunner
- set KDE_IS_PRELINKED unconditionally (#244065)
- License: LGPLv2+
This commit is contained in:
Rex Dieter 2007-08-03 14:23:17 +00:00
parent 969f328dce
commit 627f4905d5
3 changed files with 133 additions and 41 deletions

16
kde.csh
View File

@ -1,17 +1,17 @@
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here
# When/if using prelinking, avoids (some) use of kdeinit
if ( -f /etc/sysconfig/prelink ) then
set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
if ( "$PRELINKING" == "yes" ) then
## When/if using prelinking, avoids (some) use of kdeinit
#if ( -f /etc/sysconfig/prelink ) then
# set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
# if ( "$PRELINKING" == "yes" ) then
if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
endif
endif
# endif
#endif
# if not using IP6, speeds DNS operations
## if not using IPv6, speeds DNS operations
# if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1
# Make sure KDEDIRS is set
## Make sure KDEDIRS is set
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr

10
kde.sh
View File

@ -2,13 +2,13 @@
## for possible entries here
## When/if using prelinking, avoids (some) use of kdeinit
if [ -f /etc/sysconfig/prelink ]; then
if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
#if [ -f /etc/sysconfig/prelink ]; then
# if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
[ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
fi
fi
# fi
#fi
## IPV6 support
## if not using IPv6, speeds DNS operations
#[ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6
## Make sure KDEDIRS is set

View File

@ -1,4 +1,6 @@
# kdelibs3 review: http://bugzilla.redhat.com/248899
%define distname "Fedora"
#define debug 1
@ -18,25 +20,26 @@
%define make_cvs 1
%define apidocs 1
Summary: K Desktop Environment - Libraries
Version: 3.5.7
Release: 13%{?dist}
Release: 16%{?dist}
#if 0%{?fedora} > 7
%if 0
Name: kdelibs3
Provides: kdelibs = 6:%{version}-%{release}
Name: kdelibs3
Obsoletes: kdelibs < 6:%{version}-%{release}
Provides: kdelibs = 6:%{version}-%{release}
%else
Name: kdelibs
Epoch: 6
%define apidocs 1
%define libkdnssd libkdnssd
# To help transition to kde4
Provides: kdelibs3 = %{version}-%{release}
Name: kdelibs
Epoch: 6
Obsoletes: kdelibs3 = %{version}-%{release}
Provides: kdelibs3 = %{version}-%{release}
%endif
Summary: K Desktop Environment - Libraries
License: LGPL
# FIXME/TODO: there appear to be bits of ARTISTIC, BSD, GPLv2, GFDLv2(?), QPL too -- Rex
License: LGPLv2+
Url: http://www.kde.org/
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -92,6 +95,8 @@ BuildRequires: sudo
Requires(hint): sudo
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
%define libkdnssd libkdnssd
Requires: %{libkdnssd}
%define BuildRequires: xorg-x11-proto-devel libX11-devel
%define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
Requires: iceauth
@ -100,7 +105,6 @@ Requires: iceauth
Requires(pre): coreutils
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%{?libkdnssd:Requires: %{libkdnssd}}
BuildRequires: gettext
BuildRequires: pcre-devel
@ -149,6 +153,10 @@ BuildRequires: OpenEXR-devel
BuildRequires: automake libtool
%endif
%if "%{name}" != "kdelibs" && "%{?apidocs}" != "1"
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
%endif
%description
Libraries for the K Desktop Environment:
KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
@ -159,10 +167,12 @@ kimgio (image manipulation).
%package devel
Group: Development/Libraries
Summary: Header files and documentation for compiling KDE applications.
Conflicts: kdelibs4-devel
%if "%{name}" == "kdelibs"
Provides: kdelibs3-devel = %{version}-%{release}
Obsoletes: kdelibs3-devel < %{version}-%{release}
Provides: kdelibs3-devel = %{version}-%{release}
%else
Conflicts: kdelibs-devel
Obsoletes: kdelibs-devel < 6:%{version}-%{release}
Provides: kdelibs-devel = 6:%{version}-%{release}
%endif
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
@ -188,8 +198,15 @@ applications for KDE.
%package apidocs
Group: Development/Documentation
Summary: KDE API documentation.
Requires: %{name} = %{epoch}:%{version}
Obsoletes: kdelibs-docs < %{epoch}:%{version}-%{release}
Requires: %{name} = %{?epoch:%{epoch}:}:%{version}
%if "%{name}" == "kdelibs"
Provides: kdelibs3-apidocs = %{version}-%{release}
%else
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
Provides: kdelibs-apidocs = 6:%{version}-%{release}
%endif
## old, never published outside of rawhide, afaik -- Rex
#Obsoletes: kdelibs-docs < 6:%{version}-%{release}
%description apidocs
This package includes the KDE API documentation in HTML
format for easy browsing
@ -364,15 +381,17 @@ rm -f %{buildroot}%{_libdir}/libkdnssd.la
%if "%{name}" != "kdelibs"
# remove conflicts with kdelibs-4
pushd %{buildroot}%{_bindir}
rm -f checkXML cupsdconf cupsdoprint imagetops kaddprinterwizard kconfig_compiler kconf_update kcookiejar \
rm -f cupsdconf cupsdoprint imagetops kaddprinterwizard kconf_update kcookiejar \
kde-menu kdesu_stub kdontchangethehostname kdostartupconfig kio_http_cache_cleaner kioslave \
klauncher kpac_dhcp_helper ksendbugmail kstartupconfig ksvgtopng ktradertest kunittestmodrunner \
make_driver_db_cups make_driver_db_lpr makekdewidgets meinproc preparetips \
klauncher kpac_dhcp_helper ksendbugmail kstartupconfig ktradertest \
make_driver_db_cups make_driver_db_lpr meinproc preparetips \
khotnewstuff kinstalltheme kcmshell kfile kioexec
# devel stuff (skip for now)
#rm -f checkXML kconfig_compiler ksvgtopng kunittestmodrunner makekdewidgets
popd
rm -f %{buildroot}%{_datadir}/config/* %{buildroot}%{_datadir}/config/ui/kprintpreviewui.rc || :
rm -rf %{buildroot}%{_datadir}/config/colors %{buildroot}%{_datadir}/apps/k* %{buildroot}%{_datadir}/apps/LICENSES \
%{buildroot}%{_datadir}/apps/proxyscout %{buildroot}%{_datadir}/locale %{buildroot}%{_datadir}/icons \
%{buildroot}%{_datadir}/apps/proxyscout %{buildroot}%{_datadir}/locale \
%{buildroot}%{_datadir}/autostart %{buildroot}/etc/xdg %{buildroot}%{_docdir}/HTML %{buildroot}%{_datadir}/emoticons
%endif
@ -383,25 +402,73 @@ rm -rf %{buildroot}
%post
/sbin/ldconfig
%if "%{name}" == "kdelibs"
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
%endif
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
%postun
/sbin/ldconfig
%if "%{name}" == "kdelibs"
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
%endif
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
%files
%defattr(-,root,root,-)
%doc COPYING.LIB
%config(noreplace) %{_sysconfdir}/profile.d/*
%{_bindir}/*
%{_bindir}/artsmessage
%{_bindir}/cupsdconf
%{_bindir}/cupsdoprint
%{_bindir}/dcop
%{_bindir}/dcopclient
%{_bindir}/dcopfind
%{_bindir}/dcopobject
%{_bindir}/dcopquit
%{_bindir}/dcopref
%{_bindir}/dcopserver
%{_bindir}/dcopserver_shutdown
%{_bindir}/dcopstart
%{_bindir}/filesharelist
%{_bindir}/fileshareset
%{_bindir}/imagetops
%{_bindir}/kab2kabc
%{_bindir}/kaddprinterwizard
%{_bindir}/kbuildsycoca
%{_bindir}/kcmshell
%{_bindir}/kconf_update
%{_bindir}/kcookiejar
%{_bindir}/kde-config
%{_bindir}/kde-menu
%{_bindir}/kded
%{_bindir}/kdeinit
%{_bindir}/kdeinit_shutdown
%{_bindir}/kdeinit_wrapper
%{_bindir}/kdesu_stub
%{_bindir}/kdontchangethehostname
%{_bindir}/kdostartupconfig
%{_bindir}/kfile
%{_bindir}/kfmexec
%{_bindir}/khotnewstuff
%{_bindir}/kinstalltheme
%{_bindir}/kio_http_cache_cleaner
%{_bindir}/kio_uiserver
%{_bindir}/kioexec
%{_bindir}/kioslave
%{_bindir}/klauncher
%{_bindir}/kmailservice
%{_bindir}/ksendbugmail
%{_bindir}/kshell
%{_bindir}/kstartupconfig
%{_bindir}/ktelnetservice
%{_bindir}/ktradertest
%{_bindir}/kwrapper
%{_bindir}/lnusertemp
%{_bindir}/make_driver_db_cups
%{_bindir}/make_driver_db_lpr
%{_bindir}/meinproc
%{_bindir}/preparetips
%{_bindir}/start_kdeinit
%attr(4755,root,root) %{_bindir}/kgrantpty
%{_libdir}/lib*.so.*
%{_libdir}/libkdeinit_*.so
@ -409,7 +476,12 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%{_libdir}/kde3/
%{_datadir}/applications/kde/*.desktop
%{_datadir}/apps/*
%exclude %{_datadir}/apps/ksgmltools/
%exclude %{_datadir}/apps/kdewidgets/
%exclude %{_libdir}/kde3/plugins/designer/kdewidgets.*
%config(noreplace) %{_datadir}/config/*
%{_datadir}/icons/crystalsvg/
%{_datadir}/icons/default.kde
%{_datadir}/mimelnk/magic
%{_datadir}/mimelnk/*/*.desktop
%{_datadir}/services/*
@ -421,8 +493,6 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
%{_datadir}/autostart/*
%{_datadir}/emoticons/*
%{_datadir}/icons/crystalsvg/
%{_datadir}/icons/default.kde
%{_datadir}/locale/all_languages
%{_docdir}/HTML/en/common
%{_docdir}/HTML/en/kspell
@ -430,7 +500,16 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%files devel
%defattr(-,root,root,-)
%{_bindir}/checkXML
%{_bindir}/dcopidl*
%{_bindir}/kconfig_compiler
%{_bindir}/ksvgtopng
%{_bindir}/kunittestmodrunner
%{_bindir}/makekdewidgets
%{_datadir}/apps/kdewidgets/
%dir %{_libdir}/kde3/plugins/designer
%{_libdir}/kde3/plugins/designer/kdewidgets.*
%{_datadir}/apps/ksgmltools/
%{_includedir}/kde/
%{_libdir}/lib*.so
%{_libdir}/lib*.a
@ -445,6 +524,19 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%changelog
* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-16
- undo kdelibs3 rename (for now, anyway)
- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
ksvgtopng, kunittestmodrunner
- set KDE_IS_PRELINKED unconditionally (#244065)
- License: LGPLv2+
* Fri Jul 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-15
- Obsoletes/Provides: kdelibs-apidocs (kdelibs3)
* Fri Jul 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-14
- toggle kdelibs3 (f8+)
* Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-13
- build fails against cups-1.3 (#248717)
- incorporate kdelibs3 bits (not enabled... yet)