updated: kde-settings

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@605 ec354946-7b23-47d6-9f5a-488ba84defc7

k/kde-settings/kde-settings-vl.spec

@@ -1,12 +1,25 @@
+%define majorver 4.4
+%define minorver 13
+
 Summary: Config files for kde
+Summary(ja): KDE の設定ファイル
 Name:    kde-settings
-Version: 4.4
-Release: 9%{?_dist_release}
+Version: %{majorver}.%{minorver}
+Release: 1%{?_dist_release}
 
 Group:   System Environment/Base
 License: Public Domain
 URL:     http://fedorahosted.org/kde-settings
-Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-8.tar.bz2
+Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{majorver}-%{minorver}.tar.bz2
+
+# customized for Vine Linux (don't use pam_selinux.so)
+Source20: kdm.pamd
+Source21: kdm-np.pamd
+
+# customized for Vine Linux
+Patch1:   kdmrc_vine.patch
+Patch2:   backgroundrc_vine.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 
@@ -29,10 +42,14 @@ Obsoletes: kde-config < %{version}-%{release}
 # Conflicts: kdelibs3 < 3.5.10-17
 
 %description
-%{summary}.
+Config files for kde
+
+%description -l ja
+KDE で使用する設定ファイルです．
 
 %package kdm
 Summary: Configuration files for kdm
+Summary(ja): KDM の設定ファイル
 Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < 4.0 
 Requires: kdm
@@ -43,9 +60,13 @@ Requires(post): coreutils grep sed
 #Requires(post): kde4-macros(api) = %{_kde4_macros_api}
 # failsafe session (rhbz#491251)
 #Requires: xterm
+
 %description kdm
 %{summary}.
 
+%description kdm -l ja
+KDM で使用する設定ファイルです．
+
 %package pulseaudio
 Summary: Enable pulseaudio support in KDE
 Group:   System Environment/Base
@@ -60,29 +81,35 @@ Requires: alsa-plugins-pulseaudio
 
 
 %prep
-%setup -q -n %{name}-%{version}-8
+%setup -q -n %{name}-%{majorver}-%{minorver}
+
+%patch1 -p1 
+%patch2 -p1
 
+# unpackaged files, should probably omit this from the tarball. ;) -- Rex
+rm -fv Makefile
 
 %build
 # Intentionally left blank.  Nothing to see here.
 
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}{%{_datadir}/config,%{_sysconfdir}/kde/kdm}
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT{%{_datadir}/config,%{_sysconfdir}/kde/kdm}
 
-tar cpf - etc/ usr/ | tar --directory %{buildroot} -xvpf -
+tar cpf - . | tar --directory $RPM_BUILD_ROOT -xvpf -
 
 # kdebase/kdm symlink
-rm -rf   %{buildroot}%{_datadir}/config/kdm
-ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
+rm -rf $RPM_BUILD_ROOT%{_datadir}/config/kdm
+ln -sf ../../../etc/kde/kdm $RPM_BUILD_ROOT%{_datadir}/config/kdm
 
 # own /var/run/kdm
-mkdir -p %{buildroot}%{_localstatedir}/run/kdm
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/kdm
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/kdm
 
 # rhel stuff
-rm -f %{buildroot}%{_sysconfdir}/kde/env/fedora-bookmarks.sh \
-      %{buildroot}%{_sysconfdir}/kde/shutdown/gpg-agent*.sh
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/fedora-bookmarks.sh \
+      $RPM_BUILD_ROOT%{_sysconfdir}/kde/shutdown/gpg-agent*.sh
 
 # rename for profile.d/kde.(sh|csh) for kdelibs3
 mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde.sh \
@@ -90,24 +117,28 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde.sh \
 mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde.csh \
     $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde4.csh
 
+# overwrite pam.d/kdm, pam.d/kdm-np
+install -m644 %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm
+install -m644 %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm-np
+
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %pre kdm
 ## KDM fixup(s)
 # handle move from /etc/X11/xdm/kdmrc to /etc/kde/kdm/kdmrc
 [ -L %{_sysconfdir}/kde/kdm/kdmrc ] && \
-  %{__mv} -v %{_sysconfdir}/kde/kdm/kdmrc %{_sysconfdir}/kde/kdm/kdmrc.rpmorig ||:
+  mv -v %{_sysconfdir}/kde/kdm/kdmrc %{_sysconfdir}/kde/kdm/kdmrc.rpmorig ||:
 # handle %%_datadir/config/kdm -> /etc/kde/kdm
 [ -d %{_datadir}/config/kdm -a ! -L %{_datadir}/config/kdm ] && \
-  %{__mv} -v %{_datadir}/config/kdm %{_datadir}/config/kdm.rpmorig ||:
+  mv -v %{_datadir}/config/kdm %{_datadir}/config/kdm.rpmorig ||:
 
 %post kdm
 ## KDM fixup(s)
 # handle move from /etc/X11/xdm/kdmrc to /etc/kde/kdm/kdmrc
 [ ! -f %{_sysconfdir}/kde/kdm/kdmrc -a -f %{_sysconfdir}/kde/kdm/kdmrc.rpmnew ] && \
-  %{__cp} -a %{_sysconfdir}/kde/kdm/kdmrc.rpmnew %{_sysconfdir}/kde/kdm/kdmrc ||:
+  cp -a %{_sysconfdir}/kde/kdm/kdmrc.rpmnew %{_sysconfdir}/kde/kdm/kdmrc ||:
 # kdm v3 themes don't work (#444730)
 # this hack assumes %_datadir != %_kde4_datadir
 (grep "^Theme=%{_datadir}/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
@@ -122,10 +153,10 @@ rm -rf %{buildroot}
 %{_sysconfdir}/kde/env/env.sh
 %{_sysconfdir}/kde/env/gpg-agent*.sh
 %{_sysconfdir}/kde/env/gtk2_rc_files.sh
-%if 0%{?fedora}
-%{_sysconfdir}/kde/env/fedora-bookmarks.sh
-%{_sysconfdir}/kde/shutdown/gpg-agent*.sh
-%endif
+#if 0%{?fedora}
+#{_sysconfdir}/kde/env/fedora-bookmarks.sh
+#{_sysconfdir}/kde/shutdown/gpg-agent*.sh
+#endif
 %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
@@ -139,8 +170,9 @@ rm -rf %{buildroot}
 # compat symlink
 %{_datadir}/config/kdm
 %dir %{_sysconfdir}/kde/kdm
-%config(noreplace) %{_sysconfdir}/kde/kdm/backgroundrc
 %config(noreplace) %{_sysconfdir}/kde/kdm/kdmrc
+%dir %{_localstatedir}/lib/kdm
+%config(noreplace) %{_localstatedir}/lib/kdm/backgroundrc
 %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/kde/kdm/README*
 %{_sysconfdir}/kde/kdm/Xaccess
 %{_sysconfdir}/kde/kdm/Xresources
@@ -155,6 +187,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Mar 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.13-1
+- updated to 4.4-13
+- added SOURCE20, 21 to avoid using pam_selinux.so
+- added Patch1 for kdmrc cutomization
+- added Patch2 for backgroundrc cutomization
+- moved /etc/kde/kdm/backgroundrc => /var/lib/kdm/backgroundrc (#522513)
+- own /var/lib/kdm (regression, #442081)
+- added Japanese summary
+
 * Sat Feb 27 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4-9
 - initial build for Vine Linux