rpms/kdebase/devel kde-legacy.pamd, NONE, 1.1 kde-np-legacy.pamd, NONE, 1.1 kde-np.pamd, NONE, 1.1 kde.pamd, NONE, 1.1 kdebase.spec, 1.255, 1.256 kde-np, 1.4, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Jun 20 12:06:10 UTC 2007 

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21768

Modified Files:
	kdebase.spec 
Added Files:
	kde-legacy.pamd kde-np-legacy.pamd kde-np.pamd kde.pamd 
Removed Files:
	kde-np 
Log Message:
* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-4
- -devel: Requires: %name... 
- portability++



--- NEW FILE kde-legacy.pamd ---
#%PAM-1.0
auth       sufficient  pam_timestamp.so
auth       required    pam_stack.so service=system-auth
account	   required    pam_nologin.so 
account    required    pam_stack.so service=system-auth
password   required    pam_stack.so service=system-auth
session    required    pam_stack.so service=system-auth
session    required    pam_loginuid.so
session    optional    pam_timestamp.so
session    optional    pam_console.so


--- NEW FILE kde-np-legacy.pamd ---
#%PAM-1.0
auth       required	pam_env.so
auth       required	pam_nologin.so
auth       required	pam_permit.so
account    required	pam_stack.so service=system-auth
password   required	pam_stack.so service=system-auth
session    required	pam_stack.so service=system-auth
session    required     pam_loginuid.so
session    optional     pam_selinux.so
session    optional     pam_console.so


--- NEW FILE kde-np.pamd ---
#%PAM-1.0
auth       required	pam_env.so
auth       required	pam_nologin.so
auth       required	pam_permit.so
account    include	system-auth
password   include	system-auth
session	   optional	pam_keyinit.so force revoke
session    include	system-auth
session    required     pam_loginuid.so
session    optional     pam_selinux.so
session    optional     pam_console.so


--- NEW FILE kde.pamd ---
#%PAM-1.0
auth       include     system-auth
account    required    pam_nologin.so
account    include     system-auth
password   include     system-auth
session    optional    pam_keyinit.so force revoke
session    include     system-auth
session    required    pam_loginuid.so
session    optional    pam_selinux.so
session    optional    pam_console.so


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- kdebase.spec	16 Jun 2007 19:11:13 -0000	1.255
+++ kdebase.spec	20 Jun 2007 12:05:33 -0000	1.256
@@ -18,7 +18,7 @@
 Name:    kdebase
 Epoch:   6
 Version: 3.5.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Url: http://www.kde.org
@@ -30,7 +30,7 @@
 Source2: KDE.session.gnome
 Source3: kde.desktop
 Source4: kde-redhat-config-3.5-fc7-1.tar.bz2
-Source5: kde-np
+Source5: kde-np.pamd
 Source6: logrotate-kdm
 Source7: mailsettings.cc
 Source8: env.sh
@@ -39,6 +39,10 @@
 Source11: cr48-app-package_games_kids.png
 Source12: kderc
 
+Source50:   kde-np-legacy.pamd
+Source1001: kde.pamd
+Source1002: kde-legacy.pamd
+
 Patch0: kdebase-3.5.5-redhat-pam.patch
 Patch1: kdebase-3.5.7-1-redhat-startkde.patch
 Patch2: kdebase-3.3.92-vroot.patch
@@ -75,9 +79,6 @@
 # /sbin/fuser
 Requires: psmisc
 
-%ifarch %{ix86} x86_64 ia64 ppc ppc64
-Requires: pm-utils
-%endif
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -146,9 +147,7 @@
 %endif
 %if 0%{?fedora} > 5 || 0%{?rhel} > 4
 # See also http://bugzilla.redhat.com/205767
-BuildRequires: libutempter-devel
-%else
-BuildRequires: utempter
+%define _with_libutempter 1
 %endif
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
@@ -172,7 +171,8 @@
 
 %package devel
 Summary: Development files for kdebase
-Requires: kdelibs-devel >= %{version}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
 Group: Development/Libraries
 %description devel
 Header files for developing applications using kdebase.
@@ -204,7 +204,7 @@
 %patch8 -p1 -b .logo
 %patch10 -p1 -b .kdestop-konsole
 %patch11 -p1 -b .xdg
-%patch13 -p1 -b .dbus
+%{?_with_hal:%patch13 -p1 -b .dbus}
 %patch14 -p1 -b .kdm-readme
 %patch15 -p1 -b .konsole-fonts
 %patch18 -p1 -b .klipper
@@ -214,14 +214,9 @@
 %patch24 -p1 -b .tango-icon-theme
 %patch25 -p1 -b .konqueror-shortcut
 %{?_with_suspend:%patch26 -p1 -b .suspend}
-%patch27 -p1 -b .consolekit
+%{?_with_hal:%patch27 -p1 -b .consolekit}
 %patch28 -p1 -b .kdm-alternatebackground
 
-%if 0%{?rhel:1}
-   rm -rf kdeprint/kdeprintfax
-   perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
-%endif
-
 %if %redhatify
    cp %{SOURCE1} konsole
    # set Konqueror version
@@ -272,7 +267,8 @@
 %else
    --enable-debug \
 %endif
-   --includedir=%{_includedir}/kde
+   --includedir=%{_includedir}/kde \
+  %{?_with_hal} %{!?_with_hal:--without-hal}
 
 make %{?_smp_mflags}
 
@@ -290,18 +286,17 @@
 # Fix up permissions on some things
 chmod 755 %{buildroot}%{_bindir}/kdesud
 
-# install pam configuration file
-install -p -D -m 644 %{SOURCE5} %{buildroot}/etc/pam.d/kdm-np
-install -p -D -m 644 kdm.pamd %{buildroot}/etc/pam.d/kdm
-install -p -D -m 644 kde.pamd %{buildroot}/etc/pam.d/kscreensaver
-install -p -D -m 644 kde.pamd %{buildroot}/etc/pam.d/kcheckpass
-
-%if 0%{?rhel:1}
-rm -rf %{buildroot}%{_bindir}/kappfinder \
-       %{buildroot}%{_datadir}/applnk/System/kappfinder.desktop \
-       %{buildroot}%{_datadir}/applications/kde/kappfinder.desktop \
-       %{buildroot}%{_datadir}/icons/*/*/*/kappfinder.png \
-       %{buildroot}%{_datadir}/apps/kappfinder
+## install pam configuration files
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+install -p -m644 -D %{SOURCE5}    $RPM_BUILD_ROOT/etc/pam.d/kdm-np
+install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kdm
+install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
+install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
+%else
+install -p -m644 -D %{SOURCE50}   $RPM_BUILD_ROOT/etc/pam.d/kdm-np
+install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kdm
+install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
+install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
 %endif
 
 # Nuke man2html - we get it from man
@@ -433,7 +428,7 @@
 
 
 %files extras
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 # kappfinder
 %{_bindir}/kappfinder
 %{_datadir}/applications/kde/kappfinder.desktop
@@ -463,7 +458,7 @@
 %{_datadir}/icons/hicolor/*/apps/kpager.png
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 # kappfinder
 %exclude %{_datadir}/applications/kde/kappfinder.desktop
 %exclude %{_datadir}/applnk/System/kappfinder.desktop
@@ -559,7 +554,7 @@
 %{_bindir}/knetattach
 %{_bindir}/kompmgr
 %{_bindir}/konqueror
-%attr(2755,root,utempter) %{_bindir}/konsole
+%{?_with_libutempter:%attr(2755,root,utempter) }%{_bindir}/konsole
 %{_bindir}/kpm
 %{_bindir}/kprinter
 %{_bindir}/krandom.kss
@@ -618,7 +613,7 @@
 %{_datadir}/apps/kdm/faces/
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/kde/*.h
 %dir %{_includedir}/kde/kate
 %{_includedir}/kde/kate/*
@@ -633,6 +628,10 @@
 
 
 %changelog
+* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-4
+- -devel: Requires: %%name... 
+- portability++
+
 * Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
 - specfile portability
 


--- kde-np DELETED ---

More information about the scm-commits mailing list