rpms/kdebase/devel kdebase.spec,1.258,1.259

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdebase.spec 
Log Message:
* Fri Jul 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
- %ifnarch s390 s390x: BR: lm_sensors



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- kdebase.spec	13 Jul 2007 17:42:49 -0000	1.258
+++ kdebase.spec	21 Jul 2007 03:33:11 -0000	1.259
@@ -18,7 +18,7 @@
 Name:    kdebase
 Epoch:   6
 Version: 3.5.7
-Release: 6%{?dist}
+Release: 8%{?dist}
 
 License: GPL
 Url: http://www.kde.org
@@ -157,8 +157,6 @@
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
 BuildRequires: libusb-devel
-%endif
-%ifarch alpha %{ix86} x86_64
 BuildRequires: lm_sensors-devel
 %endif
 BuildRequires: OpenEXR-devel
@@ -392,12 +390,10 @@
       echo "OnlyShowIn=KDE;" >> $f
    done
 
-   # "create/own {/usr,/etc/kde}/{env,shutdown}", http://bugzilla.redhat.com/178326
-   mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
-   mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown}
-   install -p -m755 %{SOURCE8} %{buildroot}/etc/kde/env/
 %endif
 
+install -p -m755 -D %{SOURCE8} %{buildroot}%{_sysconfdir}/kde/env/env.sh
+
 # Own Mozilla plugin dir
 mkdir -p %{buildroot}%{_libdir}/mozilla/plugins
 
@@ -495,10 +491,10 @@
 %doc AUTHORS COPYING README
 %doc %{_docdir}/HTML/en/*
 %config(noreplace) /etc/ksysguarddrc
-/etc/kde
 %config(noreplace) /etc/xdg/menus/*
 %config(noreplace) /etc/logrotate.d/kdm
 %config(noreplace) %{_datadir}/xsessions/*
+{%_sysconfdir}/kde/env/*
 %if ! %{kde_settings}
 %dir /etc/skel/.kde
 /etc/skel/.kde/*
@@ -595,13 +591,13 @@
 %{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin
-%{_datadir}/applications/*
-%{_datadir}/applnk/
+%{_datadir}/applications/*/*
+%{_datadir}/applnk/*/*
 %{_datadir}/apps/*
 %{_datadir}/autostart/*
 %config(noreplace) %{_datadir}/config/*
-%{_datadir}/config.kcfg/
-%{_datadir}/desktop-directories
+%{_datadir}/config.kcfg/*
+%{_datadir}/desktop-directories/*
 %if ! %{redhatify}
 %{_datadir}/fonts/bitmap-fonts/*
 %endif
@@ -609,17 +605,12 @@
 %{_datadir}/icons/*color/*/*/*
 %{_datadir}/locale/*/entry.desktop
 %{_datadir}/locale/l10n
-%{_datadir}/mimelnk/application/*
-%{_datadir}/mimelnk/fonts
-%{_datadir}/mimelnk/inode
-%{_datadir}/mimelnk/media
-%{_datadir}/mimelnk/print
+%{_datadir}/mimelnk/*/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
-%{_datadir}/sounds/
-%{_datadir}/templates/
-%{_datadir}/wallpapers/
-%{_datadir}/apps/kdm/faces/
+%{_datadir}/sounds/*
+%{_datadir}/templates/*
+%{_datadir}/wallpapers/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -637,6 +628,12 @@
 
 
 %changelog
+* Fri Jul 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
+- %%ifnarch s390 s390x: BR: lm_sensors
+
+* Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-7
+- omit dirs owned by kde-filesystem
+
 * Mon Jul 02 2007 Than Ngo <than at redhat.com> - 6:3.5.7-6
 - fix bz#244906