rpms/kdelibs/devel kde4.csh, 1.1.2.1, 1.1.2.2 kde4.sh, 1.1.2.1, 1.1.2.2 kdelibs.spec, 1.223.2.11, 1.223.2.12
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Aug 3 18:20:32 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17515
Modified Files:
Tag: kdelibs-kde4-branch
kde4.csh kde4.sh kdelibs.spec
Log Message:
* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-3
- name kdelibs4, don't mess with %_prefix (for now)
- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
ksvgtopng, kunittestmodrunner
- set KDE_IS_PRELINKED unconditionally (#244065)
- License: LGPLv2
- Requires: shared-mime-info
Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- kde4.csh 29 Jul 2007 19:46:14 -0000 1.1.2.1
+++ kde4.csh 3 Aug 2007 18:19:59 -0000 1.1.2.2
@@ -1,22 +1,16 @@
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here
-# Make sure KDEDIRS is set
+## Make sure KDEDIRS is set
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
-# When/if using prelinking, avoids use of kdeinit
+## When/if using prelinking, avoids use of kdeinit
if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-# fork io slaves from prog, not kdeinit. may help selinux. (experimental)
+## if not using IP6, speeds DNS operations
+# # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1
+
+## fork io slaves from prog, not kdeinit. may help selinux. (experimental)
# don't enable until http://bugs.kde.org/88557 is fixed
# if ( ! $?KDE_FORK_SLAVES ) setenv KDE_FORK_SLAVES 1
-# consider for older glibc's (pre glibc 2.3)
-# if ( ! $?KDE_MALLOC ) setenv KDE_MALLOC 1
-
-# if not using IP6, speeds DNS operations
-# if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1
-
-# May help some artd crashes as suggested in http://bugs.kde.org/117318
-# if ( ! $?GLIBCXX_FORCE_NEW ) setenv GLIBCXX_FORCE_NEW 1
-
Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- kde4.sh 29 Jul 2007 19:46:14 -0000 1.1.2.1
+++ kde4.sh 3 Aug 2007 18:19:59 -0000 1.1.2.2
@@ -1,22 +1,16 @@
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here
-# Make sure KDEDIRS is set
+## Make sure KDEDIRS is set
[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
-# When/if using prelinking, avoids (some) use of kdeinit
+## When/if using prelinking, avoids (some) use of kdeinit
[ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-# fork io slaves from prog, not kdeinit. may help selinux (experimetal)
-# don't enable until http://bugs.kde.org/88557 is fixed
-# [ -z "$KDE_FORK_SLAVES" ] && KDE_FORK_SLAVES=1 && export KDE_FORK_SLAVES
-
-# consider for older glibc's (pre glibc 2.3)
-# [ -z "$KDE_MALLOC" ] && KDE_MALLOC=1 && export KDE_MALLOC
-
-# if not using IP6, speeds DNS operations
+## if not using IP6, speeds DNS operations
# [ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6
-# May help some artd crashes as suggested in http://bugs.kde.org/117318
-# [ -z "$GLIBCXX_FORCE_NEW" ] && GLIBCXX_FORCE_NEW=1 && export GLIBCXX_FORCE_NEW
+## fork io slaves from prog, not kdeinit. may help selinux (experimetal)
+# don't enable until http://bugs.kde.org/88557 is fixed
+# [ -z "$KDE_FORK_SLAVES" ] && KDE_FORK_SLAVES=1 && export KDE_FORK_SLAVES
Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.11
retrieving revision 1.223.2.12
diff -u -r1.223.2.11 -r1.223.2.12
--- kdelibs.spec 30 Jul 2007 18:07:34 -0000 1.223.2.11
+++ kdelibs.spec 3 Aug 2007 18:19:59 -0000 1.223.2.12
@@ -1,22 +1,25 @@
+
Summary: K Desktop Environment 4 - Libraries
Version: 3.92.0
-Release: 2%{?dist}
+Release: 3%{?dist}
-%if 0%{?fedora} > 7
+#if 0%{?fedora} > 7
+%if 0
Name: kdelibs
Epoch: 6
Obsoletes: kdelibs4 < %{version}-%{release}
-Provides: kdelibs4 = %{version}-%{release}
+Provides: kdelibs4 = %{version}-%{release}
%else
Name: kdelibs4
-%define _prefix /opt/kde4
+#define _prefix /opt/kde4
%endif
-License: LGPL
-URL: http://www.kde.org/
-Group: System Environment/Libraries
+# FIXME/TODO: there appear to be bits of ARTISTIC, BSD, GPLv2, GFDL (and QPL?) too -- Rex
+License: LGPLv2
+URL: http://www.kde.org/
+Group: System Environment/Libraries
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +31,7 @@
%else
Requires: hicolor-icon-theme
Requires: kde-filesystem
+Requires: shared-mime-info
#Requires: kde4-settings
%endif
@@ -80,7 +84,7 @@
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" != "kdelibs4"
Obsoletes: kdelibs4-devel < %{version}-%{release}
-Provides: kdelibs4-devel = %{version}-%{release}
+Provides: kdelibs4-devel = %{version}-%{release}
%endif
Requires: qt4-devel
# FIXME/TODO: trim these down -- Rex
@@ -117,15 +121,14 @@
make %{?_smp_mflags} -C %{_target_platform}
+# FIXME/TODO: apidocs
+# doc/api/doxygen.sh --doxdatadir=doc/common .
+
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
-# A symlink doesn't seem to work for this purpose.
-install -D -p \
- %{buildroot}%{_libdir}/kde4/plugins/designer/kdewidgets.so \
- %{buildroot}%{_qt4_plugindir}/designer/kdewidgets.so
+make install DESTDIR=%{buildroot} -C %{_target_platform}
%if "%{_prefix}" == "/usr"
# see also use-of/patching of XDG_MENU_PREFIX in kdebase
@@ -137,6 +140,11 @@
%else
+# A symlink doesn't seem to work for this purpose.
+install -D -p \
+ %{buildroot}%{_libdir}/kde4/plugins/designer/kdewidgets.so \
+ %{buildroot}%{_qt4_plugindir}/designer/kdewidgets.so
+
mkdir -p %{buildroot}/usr/bin
cd %{buildroot}/usr/bin
ln -s ../..%{_prefix}/bin/kde4-config .
@@ -178,13 +186,22 @@
%dir %{_sysconfdir}/xdg/menus
%{_datadir}/icons/hicolor/
%endif
-%{_qt4_plugindir}/designer/kdewidgets.so
%{_bindir}/*
-%{_datadir}/apps/
-%{_datadir}/config/
+%exclude %{_bindir}/checkXML
+%exclude %{_bindir}/kconfig_compiler
+%exclude %{_bindir}/ksvgtopng
+%exclude %{_bindir}/kunittestmodrunner
+# kdewidgets
+%exclude %{_bindir}/makekdewidgets
+%exclude %{_datadir}/apps/kdewidgets/
+%exclude %{_libdir}/kde4/plugins/designer/kdewidgets.*
+%{_datadir}/apps/*
+%exclude %{_datadir}/apps/ksgmltools2/
+%{_datadir}/config/*
%{_datadir}/dbus-1/interfaces/*
-%{_datadir}/emoticons/
-%{_datadir}/kde4/
+%{_datadir}/emoticons/*
+%{_datadir}/kde4/*
+# consider omitting (or packaging separately) scalable icons, since they take ~60% of the space -- Rex
%{_datadir}/icons/oxygen/
%{_datadir}/locale/all_languages/
%{_datadir}/mime/packages/*
@@ -199,12 +216,34 @@
%files devel
%defattr(-,root,root,-)
%doc KDE4PORTING.html
+%{_bindir}/checkXML
+%{_bindir}/kconfig_compiler
+%{_bindir}/ksvgtopng
+%{_bindir}/kunittestmodrunner
+%{_bindir}/makekdewidgets
+%{_bindir}/makekdewidgets
+%{_datadir}/apps/kdewidgets/
+%dir %{_libdir}/kde4/plugins/designer
+%{_libdir}/kde4/plugins/designer/kdewidgets.*
+%{_datadir}/apps/ksgmltools2/
%{_includedir}/
%{_libdir}/lib*.so
+%if "%{_prefix}" != "/usr"
+%{_qt4_plugindir}/designer/kdewidgets.so
+%endif
%exclude %{_libdir}/libkdeinit4_*.so
+
%changelog
+* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-3
+- name kdelibs4, don't mess with %%_prefix (for now)
+- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
+ ksvgtopng, kunittestmodrunner
+- set KDE_IS_PRELINKED unconditionally (#244065)
+- License: LGPLv2
+- Requires: shared-mime-info
+
* Mon Jul 30 2007 Than Ngo <than at redhat.com> 3.92.0-2
- fix conlict with kde3
- add -DSYSCONF_INSTALL_DIR
More information about the fedora-extras-commits
mailing list