rpms/kde-settings/F-8 .cvsignore, 1.15, 1.16 kde-settings.spec, 1.21, 1.22 sources, 1.15, 1.16

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2958

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5-37
- omit errant clock_pannelapplet_wkid..._rc (#431890)
- include pulseaudio.sh, gpg-agent-*.sh scripts in tarball too



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	7 Dec 2007 10:51:09 -0000	1.15
+++ .cvsignore	19 Feb 2008 13:43:47 -0000	1.16
@@ -1,6 +1,4 @@
 etc/
 usr/
-kde-settings-3.5-33.tar.bz2
-kde-settings-3.5-34.tar.bz2
-kde-settings-3.5-35.tar.bz2
 kde-settings-3.5-36.tar.bz2
+kde-settings-3.5-37.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-8/kde-settings.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kde-settings.spec	5 Feb 2008 17:16:02 -0000	1.21
+++ kde-settings.spec	19 Feb 2008 13:43:47 -0000	1.22
@@ -1,22 +1,19 @@
 
-%define rel 36
+%define rel 37
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 3.5
-Release: %{rel}%{?dist}.3
+Release: %{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
 # 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: pulseaudio.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Source10: gpg-agent-startup.sh
-Source11: gpg-agent-shutdown.sh
 # sed/kill used in gpg-agent-(startup/shutdown).sh
 Requires: fileutils util-linux
 
@@ -74,13 +71,6 @@
 rm -rf   %{buildroot}%{_datadir}/config/kdm
 ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
 
-# pulseaudio (auto)start
-install -p -m755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/pulseaudio.sh
-
-# enable auto-startup/shutdown of gpg-agent
-install -p -m0755 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/kde/env/gpg-agent-startup.sh
-install -p -m0755 -D %{SOURCE11} %{buildroot}%{_sysconfdir}/kde/shutdown/gpg-agent-shutdown.sh
-
 
 %clean
 rm -rf %{buildroot}
@@ -136,6 +126,10 @@
 
 
 %changelog
+* Tue Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5-37
+- omit errant clock_pannelapplet_wkid..._rc (#431890)
+- include pulseaudio.sh, gpg-agent-*.sh scripts in tarball too
+
 * Tue Feb 05 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5-36.3
 - revert #431398 fix (only a bandaid, doesn't fix underlying problem)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	7 Dec 2007 10:51:09 -0000	1.15
+++ sources	19 Feb 2008 13:43:47 -0000	1.16
@@ -1 +1 @@
-ced10de6e770e0e70ed93b5d8a6a1b10  kde-settings-3.5-36.tar.bz2
+cb3bcf9124e374c52e9cdefdc081c357  kde-settings-3.5-37.tar.bz2