rpms/kde-settings/devel fedora-bookmarks.sh, NONE, 1.1 .cvsignore, 1.21, 1.22 kde-settings.spec, 1.29, 1.30 sources, 1.19, 1.20

[Than Ngo (than)]

Author: than

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

Modified Files:
	.cvsignore kde-settings.spec sources 
Added Files:
	fedora-bookmarks.sh 
Log Message:
- added default bookmarks (imported from fedora-bookmarks)



--- NEW FILE fedora-bookmarks.sh ---
#! /bin/sh

# copy default bookmarks to users homedir if not existing yet
if [ ! -e $HOME/.kde/share/apps/konqueror/bookmarks.xml ] \
   && [ -e /usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml ]; then
  mkdir -p $HOME/.kde/share/apps/konqueror/
  cp -p /usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml \
     $HOME/.kde/share/apps/konqueror/bookmarks.xml
fi


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	19 Jan 2008 16:11:34 -0000	1.21
+++ .cvsignore	15 Feb 2008 12:47:48 -0000	1.22
@@ -1 +1,2 @@
 kde-settings-4.0-9.tar.bz2
+bookmarks.xml


Index: kde-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kde-settings.spec	24 Jan 2008 03:23:06 -0000	1.29
+++ kde-settings.spec	15 Feb 2008 12:47:48 -0000	1.30
@@ -2,18 +2,20 @@
 # THIS SPECFILE IS FOR F9+ ONLY!
 # Sorry, it is just too different for conditionals to be worth it.
 
-%define rel 9
+%define rel 10
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.0
-Release: %{rel}%{?dist}.1
+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: fedora-bookmarks.sh
+Source2: bookmarks.xml
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -76,6 +78,9 @@
 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 %{SOURCE5} %{buildroot}%{_sysconfdir}/kde/env/fedora-bookmarks.sh
+install -p -m644 -D %{SOURCE6} %{buildroot}%{_datadir}/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml
 
 %clean
 rm -rf %{buildroot}
@@ -101,6 +106,7 @@
 %defattr(-,root,root,-)
 %{_sysconfdir}/kde/env/env.sh
 %{_sysconfdir}/kde/env/gpg-agent*.sh
+%{_sysconfdir}/kde/env/fedora-bookmarks.sh
 %{_sysconfdir}/kde/shutdown/gpg-agent*.sh
 %config(noreplace) /etc/pam.d/kcheckpass
 %config(noreplace) /etc/pam.d/kscreensaver
@@ -133,6 +139,10 @@
 
 
 %changelog
+* Fri Feb 15 2008 Than Ngo <than at redhat.com> 4.0-10
+- added default bookmarks (imported from fedora-bookmarks),
+  thanks Sebastian Vahl 
+
 * Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0-9.1
 - include gpg-agent scripts here (#427316)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	19 Jan 2008 16:11:34 -0000	1.19
+++ sources	15 Feb 2008 12:47:48 -0000	1.20
@@ -1 +1,2 @@
 e41c4e0d468f184969ff208d525d0cda  kde-settings-4.0-9.tar.bz2
+3ec3611b5f61a0c72a00375ae3c5c1a4  bookmarks.xml