Browse Source

setup: update to 2.8.31, use <lua> for post scriptlet

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3450 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 years ago
parent
commit
e02fc77e47
1 changed files with 17 additions and 11 deletions
  1. 17 11
      s/setup/setup-vl.spec

+ 17 - 11
s/setup/setup-vl.spec

@@ -1,15 +1,17 @@
 Summary: A set of system configuration and setup files.
 Summary(ja): システム設定およびセットアップファイル一式
 Name: setup
-Version: 2.8.1
+Version: 2.8.31
 Release: 1%{?_dist_release}
-License: public domain
+License: Public Domain
 Group: System Environment/Base
+URL: https://fedorahosted.org/setup/
+
 Source: setup-%{version}.tar.bz2
 Patch: setup-2.8.1-vine.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildArchitectures: noarch
+BuildArch: noarch
 Conflicts: initscripts < 4.26, bash <= 2.0.4-21 
 
 %description
@@ -23,12 +25,14 @@ setup files, such as passwd, group, and profile.
 %prep
 %setup -q
 %patch -p1
+./shadowconvert.sh
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/etc/profile.d
 cp -ar * %{buildroot}/etc
 rm -f %{buildroot}/etc/uidgid
+rm -f %{buildroot}/etc/COPYING
 mkdir -p %{buildroot}/var/log
 touch %{buildroot}/etc/{shadow,gshadow}
 touch %{buildroot}/var/log/lastlog
@@ -37,10 +41,10 @@ chmod 0644 %{buildroot}/etc/environment
 chmod 0400 %{buildroot}/etc/{shadow,gshadow}
 chmod 0644 %{buildroot}/var/log/lastlog
 touch %{buildroot}/etc/fstab
-touch %{buildroot}/etc/mtab
 
 # remove unpackaged files
 rm -f %{buildroot}/etc/Makefile
+rm -f %{buildroot}/etc/services.orig
 rm -f %{buildroot}/etc/serviceslint
 rm -f %{buildroot}/etc/uidgidlint
 rm -f %{buildroot}/etc/shadowconvert.sh
@@ -50,17 +54,16 @@ rm -f $RPM_BUILD_ROOT/etc/{bashrc,aliases}
 %clean
 rm -rf %{buildroot}
 
-%postun
 #throw away useless and dangerous update stuff until rpm will be able to
 #handle it ( http://rpm.org/ticket/6 )
-rm -f /etc/passwd.rpmnew
-rm -f /etc/shadow.rpmnew
-rm -f /etc/group.rpmnew
-rm -f /etc/gshadow.rpmnew
+%post -p <lua>
+for i, name in ipairs({"passwd", "shadow", "group", "gshadow"}) do
+     os.remove("/etc/"..name..".rpmnew")
+end
 
 %files
 %defattr(-,root,root)
-%doc uidgid
+%doc uidgid COPYING
 %verify(not md5 size mtime) %config(noreplace) /etc/passwd
 %verify(not md5 size mtime) %config(noreplace) /etc/group
 %verify(not md5 size mtime) %config(noreplace,missingok) /etc/shadow
@@ -86,9 +89,12 @@ rm -f /etc/gshadow.rpmnew
 %config(noreplace) %verify(not md5 size mtime) /etc/shells
 %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
-%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Thu Apr 14 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.8.31-1
+- update to 2.8.31
+- use <lua> for post scriptlet 
+
 * Sat Mar 28 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.8.1-1
 - update to 2.8.1
 - spec in utf-8