rpms/smart/EL-5 ksmarttray.desktop, NONE, 1.1 .cvsignore, 1.5, 1.6 distro.py, 1.2, 1.3 smart.pam, 1.1, 1.2 smart.spec, 1.13, 1.14 sources, 1.7, 1.8
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Sep 22 21:38:22 UTC 2007
Author: scop
Update of /cvs/pkgs/rpms/smart/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23570
Modified Files:
.cvsignore distro.py smart.pam smart.spec sources
Added Files:
ksmarttray.desktop
Log Message:
Sync with devel for first EL-5 build
--- NEW FILE ksmarttray.desktop ---
[Desktop Entry]
Name=KSmartTray
Comment=Keep up to date with package updates
Exec=ksmarttray
Type=Application
Terminal=false
Categories=System;KDE;Monitor;TrayIcon;Applet;
OnlyShowIn=GNOME;KDE;XFCE;
Icon=ksmarttray
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 1 Sep 2006 22:34:43 -0000 1.5
+++ .cvsignore 22 Sep 2007 21:37:49 -0000 1.6
@@ -1,3 +1,2 @@
-smart-0.42.tar.bz2
-smart-0.42-autofs5fix.patch
-ksmarttray.desktop
+smart-0.51.tar.bz2
+smart-0.51-auto.patch
Index: distro.py
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/distro.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- distro.py 25 Nov 2006 16:30:35 -0000 1.2
+++ distro.py 22 Sep 2007 21:37:49 -0000 1.3
@@ -5,17 +5,13 @@
"type": "rpm-sys",
"name": "RPM Database"})
- for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
- pkgconf.setFlag("multi-version", "kernel%s" % flavour)
- pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
- pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)
- for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
- pkgconf.setFlag("multi-version", "%s-kernel%s" % (clustergfs, flavour))
- pkgconf.setFlag("multi-version", "kernel-suspend2%s" % flavour)
- pkgconf.setFlag("multi-version", "kernel-suspend2%s-unsupported" % flavour)
- pkgconf.setFlag("multi-version", "kernel-suspend2%s-devel" % flavour)
- for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
- pkgconf.setFlag("multi-version", "%s-kernel-suspend2%s" % (clustergfs, flavour))
+ for kernelseries in ("kernel", "kernel-suspend2", "kernel-tuxonice"):
+ for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
+ pkgconf.setFlag("multi-version", "%s%s" % (kernelseries, flavour))
+ pkgconf.setFlag("multi-version", "%s%s-unsupported" % (kernelseries, flavour))
+ pkgconf.setFlag("multi-version", "%s%s-devel" % (kernelseries, flavour))
+ for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
+ pkgconf.setFlag("multi-version", "%s-%s%s" % (clustergfs, kernelseries, flavour))
pkgconf.setFlag("multi-version", "kernel-source")
pkgconf.setFlag("multi-version", "kernel-sourcecode")
Index: smart.pam
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/smart.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.pam 10 Apr 2006 17:22:47 -0000 1.1
+++ smart.pam 22 Sep 2007 21:37:49 -0000 1.2
@@ -1,7 +1,7 @@
#%PAM-1.0
auth sufficient pam_rootok.so
auth sufficient pam_timestamp.so
-auth required pam_stack.so service=system-auth
+auth include system-auth
session required pam_permit.so
session optional pam_timestamp.so
session optional pam_xauth.so
Index: smart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/smart.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- smart.spec 5 Feb 2007 01:05:32 -0000 1.13
+++ smart.spec 22 Sep 2007 21:37:49 -0000 1.14
@@ -1,13 +1,14 @@
-%define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+# This is not defined on Fedora buildsystems
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%bcond_without ksmarttray
%bcond_without pygtk
Summary: Next generation package handling tool
Name: smart
-Version: 0.50
-Release: 45%{?dist}
-License: GPL
+Version: 0.51
+Release: 49%{?dist}
+License: GPLv2+
Group: Applications/System
URL: http://labix.org/smart/
Source0: http://labix.org/download/smart/%{name}-%{version}.tar.bz2
@@ -16,9 +17,7 @@
Source3: smart.desktop
Source4: distro.py
Source5: ksmarttray.desktop
-Patch0: smart-0.42-autofs5fix.patch
-Patch1: smart-0.50-ccache.patch
-Patch2: smart-0.50-auto.patch
+Patch2: smart-0.51-auto.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: python-devel >= 2.3
BuildRequires: desktop-file-utils
@@ -29,7 +28,7 @@
BuildRequires: qt-devel >= 1:3.2, kdelibs-devel
BuildRequires: zlib-devel
%endif
-Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
+#Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
Requires: rpm-python >= 4.4
%{!?with_pygtk:Requires: usermode}
Requires: smart-config
@@ -73,11 +72,17 @@
%prep
%setup -q
-%patch0 -p1 -b .autofs5
-%patch1 -p0 -b .ccache
%patch2 -p1
# /usr/lib is hardcoded
perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
+install -p -m 644 %{SOURCE2} .
+# Detect whether the system is using pam_stack
+if -f /%{_lib}/security/pam_stack.so \
+ -a ! grep "Deprecated pam_stack module" /%{_lib}/security/pam_stack.so \
+ 2>&1 > /dev/null; then
+ perl -pi -e's,include(\s*)(.*),required\1pam_stack.so service=\2,' smart.pam
+ touch -r %{SOURCE2} smart.pam
+fi
%build
CFLAGS="%{optflags}"
@@ -119,7 +124,7 @@
mkdir -p %{buildroot}/etc/security/console.apps
mkdir -p %{buildroot}/etc/pam.d
install -p -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/smart-root
-install -p -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/smart-root
+install -p -m 644 smart.pam %{buildroot}/etc/pam.d/smart-root
# smart-update
install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
@@ -198,6 +203,19 @@
%endif
%changelog
+* Sat Sep 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.51-49
+- 0.51; autofs, ccache, and autotools (partially) patches addressed upstream.
+
+* Sat Sep 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.50-48
+- KSmartTray desktop entry fixes.
+- License: GPLv2+
+
+* Thu Aug 2 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-47
+- Add kernel-tuxonice series support.
+
+* Sun Jun 3 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-46
+- Autodetect pam_stack module at build time.
+
* Mon Feb 5 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-45
- Adjust checks for autotools.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smart/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 5 Feb 2007 00:46:59 -0000 1.7
+++ sources 22 Sep 2007 21:37:49 -0000 1.8
@@ -1,5 +1,2 @@
-7595df0259829fff64496f1c359a53cf smart-0.50.tar.bz2
-044e7fb260f201b23f6b0554fd70243e smart-0.50-ccache.patch
-371a72eff80e2e98e37d29275a1f5e9d smart-0.42-autofs5fix.patch
-3e758faa20a498f27deabb0f773a923d ksmarttray.desktop
-258ec68f8762e787352f39a9e8414115 smart-0.50-auto.patch
+6584bf3b977081162d19e220fdbcb3ac smart-0.51.tar.bz2
+fddb01047624daac2f0551cc10076df4 smart-0.51-auto.patch
More information about the fedora-extras-commits
mailing list