rpms/kde-settings/devel .cvsignore, 1.22, 1.23 kde-settings.spec, 1.31, 1.32 sources, 1.20, 1.21 fedora-bookmarks.sh, 1.1, NONE gpg-agent-shutdown.sh, 1.1, NONE gpg-agent-startup.sh, 1.1, NONE

[Than Ngo (than)]

Author: than

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

Modified Files:
	.cvsignore kde-settings.spec sources 
Removed Files:
	fedora-bookmarks.sh gpg-agent-shutdown.sh gpg-agent-startup.sh 
Log Message:
added default bookmarks (imported from fedora-bookmarks)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	15 Feb 2008 12:47:48 -0000	1.22
+++ .cvsignore	15 Feb 2008 13:13:43 -0000	1.23
@@ -1,2 +1,3 @@
 kde-settings-4.0-9.tar.bz2
 bookmarks.xml
+kde-settings-4.0-10.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kde-settings.spec	15 Feb 2008 12:51:59 -0000	1.31
+++ kde-settings.spec	15 Feb 2008 13:13:43 -0000	1.32
@@ -14,14 +14,9 @@
 # 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: fedora-bookmarks.sh
-Source2: bookmarks.xml
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Source10: gpg-agent-startup.sh
-Source11: gpg-agent-shutdown.sh
-
 Requires: kde-filesystem
 # /etc/pam.d/ ownership
 Requires: pam
@@ -74,14 +69,6 @@
 rm -rf   %{buildroot}%{_datadir}/config/kdm
 ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
 
-# 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
-
-# fedora-bookmarks
-install -p -m755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/fedora-bookmarks.sh
-install -p -m644 -D %{SOURCE2} %{buildroot}%{_datadir}/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml
-
 %clean
 rm -rf %{buildroot}
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	15 Feb 2008 12:47:48 -0000	1.20
+++ sources	15 Feb 2008 13:13:43 -0000	1.21
@@ -1,2 +1 @@
-e41c4e0d468f184969ff208d525d0cda  kde-settings-4.0-9.tar.bz2
-3ec3611b5f61a0c72a00375ae3c5c1a4  bookmarks.xml
+2725b063cad9c6082bb97ba8d12347ac  kde-settings-4.0-10.tar.bz2


--- fedora-bookmarks.sh DELETED ---


--- gpg-agent-shutdown.sh DELETED ---


--- gpg-agent-startup.sh DELETED ---