rpms/kdeutils/devel kdeutils.spec,1.106,1.107
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Dec 14 15:34:19 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14168
Modified Files:
kdeutils.spec
Log Message:
* Fri Dec 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.97.0-3
- libs subpkg
- Obsoletes: -extras
- omit parallel-install symlink hack
Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- kdeutils.spec 12 Dec 2007 08:04:27 -0000 1.106
+++ kdeutils.spec 14 Dec 2007 15:33:38 -0000 1.107
@@ -1,7 +1,8 @@
+
Name: kdeutils
Epoch: 6
Version: 3.97.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: K Desktop Environment - Utilities
Group: Applications/System
@@ -12,30 +13,25 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# FIXME/TODO: Tpctl is needed for klaptopdaemon
+BuildRequires: cmake
BuildRequires: kde-filesystem >= 4
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: cmake
BuildRequires: gmp-devel
-BuildRequires: qimageblitz-devel
-BuildRequires: python-devel
-BuildRequires: libXpm-devel
-BuildRequires: libXtst-devel
-BuildRequires: openldap-devel
BuildRequires: libzip-devel
-BuildRequires: libXcomposite-devel
-BuildRequires: libXdamage-devel
-BuildRequires: libxkbfile-devel
-BuildRequires: libXv-devel
-BuildRequires: libXxf86misc-devel
-BuildRequires: libXScrnSaver-devel
+BuildRequires: openldap-devel
+BuildRequires: python-devel
+BuildRequires: qimageblitz-devel
# FIXME/TODO: are there other explicit Requires?
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils
Requires: kdelibs4 >= %{version}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+
+Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
%description
Utilities for the K Desktop Environment.
@@ -54,13 +50,19 @@
* ktimer (task scheduler);
* kwikdisk (removable media utility)
+%package libs
+Summary: Runtime libraries for %{name}
+Group: System Environment/Libraries
+%description libs
+%{summary}.
+
%package devel
Group: Development/Libraries
-Summary: Header files for kdebase-workspace
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary: Development files for %{name}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: kdelibs4-devel kdepimlibs4-devel kdebase-workspace-devel
%description devel
-Header files for developing applications using %{name}.
+%{summary}.
%prep
@@ -79,30 +81,14 @@
%install
rm -rf %{buildroot}
-mkdir %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
-# move devel symlinks
-mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
-pushd %{buildroot}%{_kde4_libdir}
-for i in lib*.so
-do
- case "$i" in
- libkdeinit*.so)
- ;;
- *)
- linktarget=`readlink "$i"`
- rm -f "$i"
- ln -sf "../../$linktarget" "kde4/devel/$i"
- ;;
- esac
-done
-popd
+make install DESTDIR=%{buildroot} -C %{_target_platform}
%clean
rm -rf %{buildroot}
+
%post
/sbin/ldconfig ||:
%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
@@ -150,22 +136,30 @@
%{_kde4_docdir}/HTML/en/superkaramba/
%{_kde4_iconsdir}/hicolor/*/apps/*
%{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_datadir}/dbus-1/interfaces/*
+%{_datadir}/dbus-1/interfaces/*
%{_kde4_datadir}/config.kcfg/*
%{_kde4_datadir}/autostart/*
%{_kde4_configdir}/*
%{_kde4_libdir}/libkdeinit4_kcalc.so
-%{_kde4_libdir}/*.so.*
%{_kde4_libdir}/kde4/*
-%exclude %{_kde4_libdir}/kde4/devel/
+
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/lib*.so.*
%files devel
%defattr(-,root,root,-)
%{_kde4_includedir}/*
-%{_kde4_libdir}/kde4/devel/*
+%{_kde4_libdir}/lib*.so
+%exclude %{_kde4_libdir}/libkdeinit*.so
%changelog
+* Fri Dec 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.97.0-3
+- libs subpkg
+- Obsoletes: -extras
+- omit parallel-install symlink hack
+
* Wed Dec 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.97.0-2
- rebuild for changed _kde4_includedir
More information about the scm-commits
mailing list