spec: change lisence name

[platform/upstream/setup.git] / packaging / setup.spec

diff --git a/packaging/setup.spec b/packaging/setup.spec
index 71388e6..f565f92 100644 (file)
--- a/packaging/setup.spec
+++ b/packaging/setup.spec
@@ -1,10 +1,10 @@
 Name:           setup
-Version:        0.7
+Version:        0.9
 Release:        1
-License:        Public Domain
+License:        PD
 Summary:        A set of system configuration and setup files
 Url:            https://fedorahosted.org/setup/
-Group:          System/Base
+Group:          Base/Configuration
 Source0:        %{name}-%{version}.tar.bz2
 Source1001:     setup.manifest
 BuildRequires:  bash
@@ -14,39 +14,31 @@ BuildArch:      noarch
 The setup package contains a set of important system configuration and
 setup files, such as passwd, group, and profile.
 
+%package misc
+Summary:    Misc. basic tools and scripts
+Requires:   setup
+%description misc
+Misc. basic tools and scripts.
+
+
 %prep
 %setup -q
 
+cp %{SOURCE1001} .
 ./shadowconvert.sh
 
 %build
-cp %{SOURCE1001} .
 
 %check
 # Run any sanity checks.
 make check
 
 %install
-mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-cp -ar * %{buildroot}/etc
-rm -f %{buildroot}%{_sysconfdir}/uidgid
-rm -f %{buildroot}%{_sysconfdir}/COPYING
-mkdir -p %{buildroot}%{_localstatedir}/log
-touch %{buildroot}%{_localstatedir}/log/lastlog
+cp -ar files/* %{buildroot}
 touch %{buildroot}%{_sysconfdir}/environment
 chmod 0644 %{buildroot}%{_sysconfdir}/environment
 chmod 0400 %{buildroot}%{_sysconfdir}/{shadow,gshadow}
-chmod 0644 %{buildroot}%{_localstatedir}/log/lastlog
-touch %{buildroot}%{_sysconfdir}/fstab
-touch %{buildroot}%{_sysconfdir}/mtab
-
-# remove unpackaged files from the buildroot
-rm -f %{buildroot}%{_sysconfdir}/Makefile
-rm -f %{buildroot}%{_sysconfdir}/serviceslint
-rm -f %{buildroot}%{_sysconfdir}/uidgidlint
-rm -f %{buildroot}%{_sysconfdir}/shadowconvert.sh
-rm -rf %{buildroot}%{_sysconfdir}/packaging
-rm -rf %{buildroot}%{_sysconfdir}/*.manifest
+ln -nsf /proc/self/mounts %{buildroot}%{_sysconfdir}/mtab
 
 rm %{buildroot}/%{_sysconfdir}/filesystems
 
@@ -57,6 +49,8 @@ for i, name in ipairs({"passwd", "shadow", "group", "gshadow"}) do
      os.remove("/etc/"..name..".rpmnew")
 end
 %files
+%manifest %{name}.manifest
+%license COPYING
 %manifest setup.manifest
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/passwd
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/group
@@ -77,10 +71,19 @@ end
 %config(noreplace) %{_sysconfdir}/profile
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/protocols
 %attr(0600,root,root) %config(noreplace,missingok) %{_sysconfdir}/securetty
-%config(noreplace) %{_sysconfdir}/csh.login
-%config(noreplace) %{_sysconfdir}/csh.cshrc
 %dir %{_sysconfdir}/profile.d
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/shells
-%ghost %attr(0644,root,root) %verify(not md5 size mtime) %{_localstatedir}/log/lastlog
-%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/fstab
+%ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
+%ghost %attr(0600,root,root) %verify(not md5 size mtime) /var/log/faillog
+%ghost %attr(0664,root,utmp) %verify(not md5 size mtime) /var/log/wtmp
+%ghost %attr(0600,root,root) %verify(not md5 size mtime) /var/log/btmp
+%ghost %attr(0664,root,utmp) %verify(not md5 size mtime) /run/utmp
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/mtab
+/run/*
+/etc/profile.d/*
+
+%files misc
+%manifest %{name}.manifest
+%{_bindir}/*
+%{_sbindir}/*
+%docs_package