rpms/kde-settings/devel .cvsignore, 1.19, 1.20 kde-settings.spec, 1.25, 1.26 sources, 1.17, 1.18 kde.pam, 1.1, NONE kdm-np.pam, 1.1, NONE kdm.pam, 1.1, NONE pulseaudio.sh, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8030

Modified Files:
	.cvsignore kde-settings.spec sources 
Removed Files:
	kde.pam kdm-np.pam kdm.pam pulseaudio.sh 
Log Message:
* Thu Jan 10 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0-8
- include /etc/kde/env/env.sh (#426115)
- move extra sources into tarball
- -kdm: cleanup deps



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	4 Jan 2008 15:25:38 -0000	1.19
+++ .cvsignore	11 Jan 2008 02:28:05 -0000	1.20
@@ -1 +1 @@
-kde-settings-4.0-7.tar.bz2
+kde-settings-4.0-8.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kde-settings.spec	4 Jan 2008 15:36:42 -0000	1.25
+++ kde-settings.spec	11 Jan 2008 02:28:05 -0000	1.26
@@ -1,5 +1,5 @@
 
-%define rel 7
+%define rel 8
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -11,10 +11,6 @@
 # This is a package which is specific to our distribution.  
 # Thus the source is only available from within this srpm.
 Source0: kde-settings-%{version}-%{rel}.tar.bz2
-Source1: kdm.pam
-Source2: kde.pam
-Source3: kdm-np.pam
-Source4: pulseaudio.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -32,8 +28,6 @@
 Summary: Config files for kdebase-workspace(kdm)
 Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < %{version}-%{release}
-Requires: kdebase-kdm >= %{version}
-%if 0%{?fedora} < 9
 %define kdm_theme redhat-artwork
 %if 0%{?fedora} == 8
 %define kdm_theme fedorainfinity-kdm-theme
@@ -42,7 +36,6 @@
 %define kdm_theme redhat-artwork-kde
 %endif
 Requires: %{kdm_theme}
-%endif
 Requires: xorg-x11-xdm
 %description kdm
 %{summary}.
@@ -64,9 +57,11 @@
 %prep
 %setup -q -c -n %{name}
 
+
 %build
 # Intentionally left blank.  Nothing to see here.
 
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}{%{_datadir}/config,%{_sysconfdir}/kde/kdm}
@@ -77,15 +72,6 @@
 rm -rf   %{buildroot}%{_datadir}/config/kdm
 ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
 
-# pam
-install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kdm
-install -p -m644 -D %{SOURCE2} %{buildroot}/etc/pam.d/kcheckpass
-install -p -m644 -D %{SOURCE2} %{buildroot}/etc/pam.d/kscreensaver
-install -p -m644 -D %{SOURCE3} %{buildroot}/etc/pam.d/kdm-np
-
-# pulseaudio (auto)start
-install -p -m755 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/kde/env/pulseaudio.sh
-
 
 %clean
 rm -rf %{buildroot}
@@ -109,6 +95,7 @@
 
 %files 
 %defattr(-,root,root,-)
+%{_sysconfdir}/kde/env/evn.sh
 %config(noreplace) /etc/pam.d/kcheckpass
 %config(noreplace) /etc/pam.d/kscreensaver
 # drop noreplace, so we can be sure to get the new kiosk bits
@@ -136,10 +123,15 @@
 
 %files pulseaudio
 %defattr(-,root,root,-)
-%{_sysconfdir}/kde/env/*.sh
+%{_sysconfdir}/kde/env/pulseaudio.sh
 
 
 %changelog
+* Thu Jan 10 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0-8
+- include /etc/kde/env/env.sh (#426115)
+- move extra sources into tarball
+- -kdm: cleanup deps
+
 * Fri Jan 04 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0-7
 - omit legacy/crufy etc/skel bits
 - -pulseaudio: -Requires: xine-lib-extras (too buggy)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	4 Jan 2008 15:25:38 -0000	1.17
+++ sources	11 Jan 2008 02:28:05 -0000	1.18
@@ -1 +1 @@
-b32b9e06832b9a78d959b81f22b1dc22  kde-settings-4.0-7.tar.bz2
+c9b92a85825046f89055adda6dcb37e2  kde-settings-4.0-8.tar.bz2


--- kde.pam DELETED ---


--- kdm-np.pam DELETED ---


--- kdm.pam DELETED ---


--- pulseaudio.sh DELETED ---