rpms/kdebase/devel kdebase.spec,1.263.2.16,1.263.2.17

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Fri Aug 17 10:22:38 UTC 2007 

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18759

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- use macros.kde4
- License: GPLv2



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.16
retrieving revision 1.263.2.17
diff -u -r1.263.2.16 -r1.263.2.17
--- kdebase.spec	31 Jul 2007 00:14:28 -0000	1.263.2.16
+++ kdebase.spec	17 Aug 2007 10:22:04 -0000	1.263.2.17
@@ -1,46 +1,41 @@
 
 Summary:       K Desktop Environment 4 - Core Files
 Version:       3.92.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 
-%if 0%{?fedora} > 7
+%if 0%{?fedora} > 8
 Name:          kdebase
 Epoch:         6
 
 Obsoletes:     kdebase4 < %{version}-%{release}
 Provides:      kdebase4 = %{version}-%{release}
 
-# /usr/bin/plasma (#250180)
-Conflicts:  rss-glx < 0.8.1.p-8
-
 %else
 Name:          kdebase4
-%define        _prefix /opt/kde4
 %endif
 
-License:       GPL
+License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# /usr/bin/plasma (#250180)
+Conflicts:  rss-glx < 0.8.1.p-8
+
 # FIXME/TODO: consider using patched/hard-coded XDG_MENU_PREFIX  
 # don't rely on env (same goes for kde3) -- Rex
 Source1: kde4-opt.sh
 Source2: kde4-xdg_menu_prefix.sh
 
-%if "%{_prefix}" != "/usr"
-# macros sensitive to _prefix mods
-%define        __cmake cmake
-%define        _sysconfdir %{_prefix}/etc
-%endif
-
 # use ~/.kde4 instead of ~/.kde
 Patch0: kdebase-%{version}-kde4home.diff
 Patch1: kdebase-%{version}-redhat-startkde.patch
 # see http://bugzilla.redhat.com/228111 , http://bugs.kde.org/147790
 Patch2: kdebase-3.91.0-consolekit-kdm.patch
 
+BuildRequires: kde-filesystem
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
@@ -52,6 +47,9 @@
 Obsoletes: %{name}-kdm < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:  %{name}-kdm = %{?epoch:%{epoch}:}%{version}-%{release}
 
+# FIXME/TODO
+#BuildRequires: libcaptury-devel
+
 BuildRequires: automake libtool
 BuildRequires: bluez-libs-devel
 BuildRequires: bzip2-devel
@@ -82,6 +80,7 @@
 BuildRequires: libxklavier-devel
 BuildRequires: lm_sensors-devel
 BuildRequires: NetworkManager-devel
+BuildRequires: OpenEXR-devel
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
 BuildRequires: pam-devel
@@ -92,9 +91,12 @@
 %else
 BuildRequires: samba
 %endif
+BuildRequires: soprano-devel
 BuildRequires: strigi-devel
 BuildRequires: xorg-x11-font-utils xorg-x11-proto-devel
 BuildRequires: zlib-devel
+# extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
+BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel
 
 %description
 Core applications for the K Desktop Environment 4.
@@ -110,15 +112,15 @@
 Provides:  kdebase4-devel = %{version}-%{release}
 %endif
 Requires: kdelibs4-devel kdepimlibs4-devel
-# FIXME/TODO: trim these down -- Rex
-Requires: libXcomposite-devel libXdamage-devel
-Requires: libXcursor-devel libXfixes-devel libXxf86misc-devel libXrender-devel
-Requires: libXrandr-devel libXext-devel libusb-devel libXres-devel
-Requires: libXScrnSaver-devel libXtst-devel
-Requires: libXinerama-devel libfontenc-devel
-Requires: cyrus-sasl-devel libart_lgpl-devel openssl-devel
-Requires: hal-devel bluez-libs-devel
-Requires: strigi-devel zlib-devel bzip2-devel libpng-devel
+## FIXME/TODO: trim these down -- Rex
+#Requires: libXcomposite-devel libXdamage-devel
+#Requires: libXcursor-devel libXfixes-devel libXxf86misc-devel libXrender-devel
+#Requires: libXrandr-devel libXext-devel libusb-devel libXres-devel
+#Requires: libXScrnSaver-devel libXtst-devel
+#Requires: libXinerama-devel libfontenc-devel
+#Requires: cyrus-sasl-devel libart_lgpl-devel openssl-devel
+#Requires: hal-devel bluez-libs-devel
+#Requires: strigi-devel zlib-devel bzip2-devel libpng-devel
 %description devel
 Header files for developing applications using %{name}.
 WARNING: This is a beta version. It probably has many bugs left.
@@ -128,9 +130,6 @@
 %prep
 %setup -q -n kdebase-%{version}
 
-%if "%{_prefix}" != "/usr"
-%patch0 -p1 -b .kde4home
-%endif
 %patch1 -p1 -b .redhat-startkde
 %patch2 -p1 -b .consolekit_kdm
 
@@ -139,9 +138,7 @@
 
 mkdir -p %{_target_platform} 
 pushd %{_target_platform}
-%cmake \
-  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  ../
+%cmake_kde4 ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -153,13 +150,11 @@
 
 install -d %{buildroot}%{_sysconfdir}/kde/{env,shutdown}
 install -D -m644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/
-%if "%{_prefix}" == "/usr"
 install -D -m644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/kde/env/
-%endif
 
-# setup %{_datadir}/apps/kdm/faces
-mkdir -p %{buildroot}%{_datadir}/apps/kdm/faces
-pushd %{buildroot}%{_datadir}/apps/kdm/faces
+# setup %{_kde4_appsdir}/kdm/faces
+mkdir -p %{buildroot}%{_kde4_appsdir}/kdm/faces
+pushd %{buildroot}%{_kde4_appsdir}/kdm/faces
 ln -sf ../pics/users/default1.png .default.face.icon
 popd
 
@@ -169,21 +164,21 @@
 sed -i -e "s|%{buildroot}||g" %{buildroot}%{_datadir}/config/kdm/* ||:
 
 sed -i \
-  -e "s|@@PREFIX@@|%{_prefix}|" \
-  -e "s|@@BINDIR@@|%{_bindir}|" \
-  -e "s|@@LIBDIR@@|%{_libdir}|" \
-  -e "s|@@SYSCONFDIR@@|%_sysconfdir}|" \
-  %{buildroot}%{_sysconfdir}/kde/env/*.sh
+  -e "s|@@PREFIX@@|%{_kde4_prefix}|" \
+  -e "s|@@BINDIR@@|%{_kde4_bindir}|" \
+  -e "s|@@LIBDIR@@|%{_kde4_libdir}|" \
+  -e "s|@@SYSCONFDIR@@|%_kde4_sysconfdir}|" \
+  %{buildroot}%{_kde4_sysconfdir}/kde/env/*.sh
 
 mkdir -p %{buildroot}/usr/share/xsessions
 ## kde->kde4 xsession
 %if "%{name}" != "kdebase"
-mv %{buildroot}%{_datadir}/apps/kdm/sessions/kde.desktop \
-   %{buildroot}%{_datadir}/apps/kdm/sessions/kde4.desktop
-sed -i -e "s|^Name=KDE$|Name=KDE4|" %{buildroot}%{_datadir}/apps/kdm/sessions/kde4.desktop
-ln -s %{_datadir}/apps/kdm/sessions/kde4.desktop %{buildroot}/usr/share/xsessions/kde4.desktop
+mv %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde.desktop \
+   %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde4.desktop
+sed -i -e "s|^Name=KDE$|Name=KDE4|" %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde4.desktop
+ln -s %{_kde4_appsdir}/kdm/sessions/kde4.desktop %{buildroot}/usr/share/xsessions/kde4.desktop
 %else
-ln -s %{_datadir}/apps/kdm/sessions/kde.desktop  %{buildroot}/usr/share/xsessions/kde.desktop
+ln -s %{_kde4_appsdir}/kdm/sessions/kde.desktop  %{buildroot}/usr/share/xsessions/kde.desktop
 %endif
 
 ## Unpackaged files
@@ -212,48 +207,47 @@
 
 %files
 %defattr(-,root,root,-)
-%if "%{_prefix}" != "/usr"
-%dir %{_datadir}/desktop-directories
-%dir %{_libdir}/kconf_update_bin
-%endif
 /usr/share/xsessions/*.desktop
-%{_sysconfdir}/kde/env/*
-#{_sysconfdir}/kde/shutdown/*
-%{_bindir}/*
-%{_datadir}/applications/kde4/*
-%{_datadir}/apps/*
-%{_datadir}/autostart/*
-%{_datadir}/config/
-%{_datadir}/config.kcfg/
+%{_kde4_sysconfdir}/kde/env/*
+#{_kde4_sysconfdir}/kde/shutdown/*
+%{_kde4_bindir}/*
+%{_kde4_datadir}/applications/kde4/*
+%{_kde4_appsdir}/*
+%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/config/
+%{_kde4_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/services/*
-%{_datadir}/desktop-directories/*
-%{_datadir}/icons/crystalsvg/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/oxygen/
-%{_datadir}/kde4/services/*
-%{_datadir}/kde4/servicetypes/*
-%{_datadir}/locale/*
-%{_datadir}/sounds/*
-%{_datadir}/wallpapers/*
-%{_datadir}/doc/HTML/en/
-%{_libdir}/lib*.so.*
-%{_libdir}/libkdeinit4_*.so
-%{_libdir}/kconf_update_bin/*
-%{_libdir}/kde4/*
+%{_kde4_datadir}/desktop-directories/*
+%{_kde4_iconsdir}/crystalsvg/
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/
+%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/locale/*
+%{_kde4_datadir}/sounds/*
+%{_kde4_datadir}/wallpapers/*
+%{_kde4_docdir}/HTML/en/
+%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libkdeinit4_*.so
+%{_kde4_libdir}/kconf_update_bin/*
+%{_kde4_libdir}/kde4/*
 %{_libdir}/strigi/*
-%config %{_sysconfdir}/*rc
-%{_sysconfdir}/xdg/menus/*.menu
-
+%config %{_kde4_sysconfdir}/*rc
+%{_kde4_sysconfdir}/xdg/menus/*.menu
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit4_*.so
+%{_kde4_includedir}/*
+%{_kde4_libdir}/lib*.so
+%exclude %{_kde4_libdir}/libkdeinit4_*.so
 
 
 %changelog
+* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
+- use macros.kde4
+- License: GPLv2
+
 * Mon Jul 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.92.0-3
 - bump rss-glx Conflicts because the conflict is still there in 0.8.1.p-7.fc8
 - rss-glx conflict only needed if "%%{_prefix}" == "/usr"

More information about the fedora-extras-commits mailing list