rpms/smart/F-9 smart-0.42-autofs5fix.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 smart.pam, 1.2, 1.3 smart.spec, 1.31, 1.32 sources, 1.14, 1.15

[Axel Thimm]

Author: athimm

Update of /cvs/extras/rpms/smart/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10830/smart/F-9

Modified Files:
	.cvsignore smart.pam smart.spec sources 
Added Files:
	smart-0.42-autofs5fix.patch 
Log Message:
Backpackage to F9/F8.

smart-0.42-autofs5fix.patch:

--- NEW FILE smart-0.42-autofs5fix.patch ---
--- smart-0.42/smart/media.py.autofs5	2005-12-14 20:40:31.000000000 +0100
+++ smart-0.42/smart/media.py	2006-09-30 10:54:22.000000000 +0200
@@ -324,7 +324,7 @@
     if os.path.isfile("/etc/auto.master"):
         for line in open("/etc/auto.master"):
             line = line.strip()
-            if not line or line[0] == "#":
+            if not line or line[0] == "#" or line[0] == "+":
                 continue
             prefix, mapfile = line.split()[:2]
             if os.path.isfile(mapfile):


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smart/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Oct 2007 10:46:08 -0000	1.11
+++ .cvsignore	24 Aug 2008 09:01:43 -0000	1.12
@@ -1,2 +1 @@
-smart-0.51-auto.patch
-smart-0.52.tar.bz2
+smart-1.0.tar.bz2


Index: smart.pam
===================================================================
RCS file: /cvs/extras/rpms/smart/F-9/smart.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smart.pam	3 Jun 2007 07:41:46 -0000	1.2
+++ smart.pam	24 Aug 2008 09:01:43 -0000	1.3
@@ -1,7 +1,7 @@
 #%PAM-1.0
 auth       sufficient	pam_rootok.so
 auth       sufficient	pam_timestamp.so
-auth       include	system-auth
+auth       required	pam_stack.so service=system-auth
 session    required	pam_permit.so
 session    optional	pam_timestamp.so
 session    optional	pam_xauth.so


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/F-9/smart.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- smart.spec	25 Mar 2008 13:22:14 -0000	1.31
+++ smart.spec	24 Aug 2008 09:01:43 -0000	1.32
@@ -6,8 +6,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.52
-Release: 54%{?dist}
+Version: 1.0
+Release: 52%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,7 +17,7 @@
 Source3: smart.desktop
 Source4: distro.py
 Source5: ksmarttray.desktop
-Patch2: smart-0.51-auto.patch
+Patch0: smart-0.42-autofs5fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
@@ -25,7 +25,7 @@
 %if %{with ksmarttray}
 BuildRequires: autoconf, automake, gcc-c++
 BuildRequires: libXt-devel, libXext-devel
-BuildRequires: kdelibs3-devel
+BuildRequires: qt-devel >= 1:3.2, kdelibs-devel
 BuildRequires: zlib-devel
 %endif
 #Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
@@ -72,7 +72,7 @@
 
 %prep
 %setup -q
-%patch2 -p1
+%patch0 -p1 -b .autofs5
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
 install -p -m 644 %{SOURCE2} .
@@ -91,10 +91,9 @@
 
 %if %{with ksmarttray}
 # ksmarttray
-unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
 pushd contrib/ksmarttray
 make -f admin/Makefile.common
-%configure --disable-rpath --disable-dependency-tracking
+%configure --disable-rpath
 make
 popd
 %endif
@@ -145,7 +144,7 @@
 
 %find_lang %{name}
 
-# Create a list w/o smart/interfaces/gtk to avoid warning of duplicate
+# Create a list w/o smart/interfaces/gtk to avoid warbing of duplicate
 # in the %files section (otherwise including all and %excluding works,
 # too
 
@@ -154,7 +153,7 @@
   | grep -v %{python_sitearch}/smart/interfaces/gtk \
   | sed -e's,%{buildroot},%%dir ,' \
   >> %{name}.fileslist
-find %{buildroot}%{python_sitearch} \! -type d \
+find %{buildroot}%{python_sitearch}/smart \! -type d \
   | grep -v %{python_sitearch}/smart/interfaces/gtk \
   | sed -e's,%{buildroot},,' \
   >> %{name}.fileslist
@@ -204,18 +203,9 @@
 %endif
 
 %changelog
-* Tue Feb 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.52-54
-- Configure ksmarttray with dependency tracking disabled.
-
-* Thu Jan  3 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.52-53
-- Include possibly generated smart-*.egg-info in main package.
-
-* Sun Dec  2 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.52-52
-- BuildRequire kdelibs3-devel instead of kdelibs-devel.
-- Explicitly source qt profile.d snippet during build.
-
-* Wed Oct 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.52-51
-- Re-remove dropped and no longer needed autofs5 patch.
+* Fri Aug 15 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.0-52
+- Update to 1.0.
+- Remove automake version patch.
 
 * Sun Oct  7 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.52-50
 - Update to 0.52.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smart/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	7 Oct 2007 10:46:08 -0000	1.14
+++ sources	24 Aug 2008 09:01:43 -0000	1.15
@@ -1,2 +1 @@
-fddb01047624daac2f0551cc10076df4  smart-0.51-auto.patch
-f1681adedd18b86f679a53ad8361c9e9  smart-0.52.tar.bz2
+f4b43912761ba100548921f34985b1d1  smart-1.0.tar.bz2