[shorewall] Rename _baseurl macro to baseurl Change the defattr to (-, root, root, -) and fix up file permissions F
Jonathan G. Underwood
jgu at fedoraproject.org
Sun Aug 21 19:17:35 UTC 2011
commit e9201cd64d49ae22b3265e455aed575b78173166
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date: Sun Aug 21 20:17:02 2011 +0100
Rename _baseurl macro to baseurl
Change the defattr to (-,root,root,-) and fix up file permissions
Fixes to file lists
shorewall.spec | 88 +++++++++++++++++++++++---------------------------------
1 files changed, 36 insertions(+), 52 deletions(-)
---
diff --git a/shorewall.spec b/shorewall.spec
index 9659ab1..01e33a3 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -1,23 +1,23 @@
%global mainver 4.4.22
-%global _baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{mainver}/
+%global baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{mainver}/
# A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
# which is found at http://www.shorewall.net/Anatomy.html
Name: shorewall
Version: %{mainver}.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An iptables front end for firewall configuration
Group: Applications/System
License: GPLv2+
URL: http://www.shorewall.net/
Provides: shorewall(firewall) = %{version}-%{release}
-Source0: %{_baseurl}/%{name}-%{version}.tar.bz2
-Source1: %{_baseurl}/%{name}-lite-%{version}.tar.bz2
-Source2: %{_baseurl}/%{name}6-%{version}.tar.bz2
-Source3: %{_baseurl}/%{name}6-lite-%{version}.tar.bz2
-Source4: %{_baseurl}/%{name}-init-%{version}.tar.bz2
+Source0: %{baseurl}/%{name}-%{version}.tar.bz2
+Source1: %{baseurl}/%{name}-lite-%{version}.tar.bz2
+Source2: %{baseurl}/%{name}6-%{version}.tar.bz2
+Source3: %{baseurl}/%{name}6-lite-%{version}.tar.bz2
+Source4: %{baseurl}/%{name}-init-%{version}.tar.bz2
# systemd service files
Source10: shorewall.service
@@ -154,6 +154,15 @@ install -m 644 %SOURCE10 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE14 $RPM_BUILD_ROOT
# Remove sysv init files
rm -rf $RPM_BUILD_ROOT%{_initrddir}
+# Fix up file permissions
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/shorewall-lite/{helpers,modules}
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/shorewall6-lite/{helpers,modules}
+chmod 755 $RPM_BUILD_ROOT/sbin/shorewall-lite
+chmod 755 $RPM_BUILD_ROOT/sbin/shorewall6-lite
+chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/shorewall-lite/shorewall-lite.conf
+chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
+chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/01-shorewall
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -295,112 +304,87 @@ fi
%files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%doc shorewall-%{version}/{COPYING,changelog.txt,releasenotes.txt,Samples}
-
-%attr(0755,root,root) /sbin/shorewall
-
+/sbin/shorewall
%dir %{_sysconfdir}/shorewall
%config(noreplace) %{_sysconfdir}/shorewall/*
%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall
-
-%attr(0755,root,root) %{_libexecdir}/shorewall
+%{_libexecdir}/shorewall
%{_datadir}/shorewall
%{perl_privlib}/Shorewall
-
%{_mandir}/man5/shorewall*
%exclude %{_mandir}/man5/shorewall6*
%exclude %{_mandir}/man5/shorewall-lite*
-
%{_mandir}/man8/shorewall*
%exclude %{_mandir}/man8/shorewall6*
%exclude %{_mandir}/man8/shorewall-lite*
-
+%exclude %{_mandir}/man8/shorewall-init*
%{_unitdir}/shorewall.service
-
%dir %{_localstatedir}/lib/shorewall
%files lite
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%doc shorewall-lite-%{version}/{COPYING,changelog.txt,releasenotes.txt}
-
-%attr(0755,root,root) /sbin/shorewall-lite
-
+/sbin/shorewall-lite
%dir %{_sysconfdir}/shorewall-lite
%config(noreplace) %{_sysconfdir}/shorewall-lite/shorewall-lite.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall-lite
%{_sysconfdir}/shorewall-lite/Makefile
-
%{_datadir}/shorewall-lite
-%attr(0755,root,root) %{_libexecdir}/shorewall-lite
-
+%{_libexecdir}/shorewall-lite
%{_mandir}/man5/shorewall-lite*
%{_mandir}/man8/shorewall-lite*
-
%{_unitdir}/shorewall-lite.service
-
%dir %{_localstatedir}/lib/shorewall-lite
%files -n shorewall6
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%doc shorewall6-%{version}/{COPYING,changelog.txt,releasenotes.txt,Samples6}
-
-%attr(0755,root,root) /sbin/shorewall6
-
+/sbin/shorewall6
%dir %{_sysconfdir}/shorewall6
%config(noreplace) %{_sysconfdir}/shorewall6/*
%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall6
-
%{_mandir}/man5/shorewall6*
%exclude %{_mandir}/man5/shorewall6-lite*
-
%{_mandir}/man8/shorewall6*
%exclude %{_mandir}/man8/shorewall6-lite*
-
-%attr(0755,root,root) %{_libexecdir}/shorewall6
+%{_libexecdir}/shorewall6
%{_datadir}/shorewall6
-
%{_unitdir}/shorewall6.service
-
%dir %{_localstatedir}/lib/shorewall6
%files -n shorewall6-lite
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%doc shorewall6-lite-%{version}/{COPYING,changelog.txt,releasenotes.txt}
-
-%attr(0755,root,root) /sbin/shorewall6-lite
-
+/sbin/shorewall6-lite
%dir %{_sysconfdir}/shorewall6-lite
%config(noreplace) %{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall6-lite
%{_sysconfdir}/shorewall6-lite/Makefile
-
%{_mandir}/man5/shorewall6-lite*
%{_mandir}/man8/shorewall6-lite*
-
%{_datadir}/shorewall6-lite
-%attr(0755,root,root) %{_libexecdir}/shorewall6-lite
-
+%{_libexecdir}/shorewall6-lite
%{_unitdir}/shorewall6-lite.service
-
%dir %{_localstatedir}/lib/shorewall6-lite
%files init
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%doc shorewall-init-%{version}/{COPYING,changelog.txt,releasenotes.txt}
-
-%attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/01-shorewall
+%{_sysconfdir}/NetworkManager/dispatcher.d/01-shorewall
%config(noreplace) %{_sysconfdir}/sysconfig/shorewall-init
-
%{_mandir}/man8/shorewall-init.8.*
-
%{_datadir}/shorewall-init
-
%{_unitdir}/shorewall-init.service
-
%attr(0755,root,root) %{_libexecdir}/shorewall-init
%changelog
+* Sat Aug 20 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.22.3-2
+- Rename _baseurl macro to baseurl
+- Change the defattr to (-,root,root,-) and fix up file permissions
+- Fixes to file lists
+
* Sat Aug 20 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.22.3-1
- Update to 4.4.22.3
More information about the scm-commits
mailing list