packages: system-config-firewall/system-config-firewall.spec - more macros

[glen]

Author: glen                         Date: Sat Mar  3 11:11:27 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more macros

---- Files affected:
packages/system-config-firewall:
   system-config-firewall.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/system-config-firewall/system-config-firewall.spec
diff -u packages/system-config-firewall/system-config-firewall.spec:1.5 packages/system-config-firewall/system-config-firewall.spec:1.6
--- packages/system-config-firewall/system-config-firewall.spec:1.5	Sat Mar  3 12:11:11 2012
+++ packages/system-config-firewall/system-config-firewall.spec	Sat Mar  3 12:11:21 2012
@@ -2,7 +2,7 @@
 Summary:	A graphical interface for basic firewall setup
 Name:		system-config-firewall
 Version:	1.2.29
-Release:	5.6
+Release:	5.7
 License:	GPL v2+
 Group:		Base
 URL:		http://fedorahosted.org/system-config-firewall
@@ -19,11 +19,11 @@
 Requires:	python-dbus
 Requires:	python-pygtk-glade
 Requires:	python-pygtk-gtk
+Requires:	python-slip-dbus >= 0.2.7
 Requires:	system-config-firewall-base = %{version}-%{release}
 Requires:	system-config-firewall-tui = %{version}-%{release}
 Provides:	system-config-securitylevel = 1.7.0
 Obsoletes:	system-config-securitylevel
-Requires:	python-slip-dbus >= 0.2.7
 ExclusiveOS:	Linux
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -95,10 +95,10 @@
 %update_icon_cache hicolor
 
 %triggerpostun -- %{name} < 1.1.0
-%{_datadir}/system-config-firewall/convert-config
+%{_datadir}/%{name}/convert-config
 
 %triggerpostun -- system-config-securitylevel
-%{_datadir}/system-config-firewall/convert-config
+%{_datadir}/%{name}/convert-config
 
 %files
 %defattr(644,root,root,755)
@@ -107,40 +107,40 @@
 /etc/dbus-1/system.d/org.fedoraproject.Config.Firewall.conf
 %{_datadir}/dbus-1/system-services/org.fedoraproject.Config.Firewall.service
 %{_datadir}/polkit-1/actions/org.fedoraproject.config.firewall.policy
-%{_datadir}/system-config-firewall/fw_gui.*
-%{_datadir}/system-config-firewall/fw_dbus.*
-%{_datadir}/system-config-firewall/fw_nm.*
-%{_datadir}/system-config-firewall/gtk_*
-%{_datadir}/system-config-firewall/*.glade
-%attr(755,root,root) %{_datadir}/system-config-firewall/system-config-firewall-mechanism.*
+%{_datadir}/%{name}/fw_gui.*
+%{_datadir}/%{name}/fw_dbus.*
+%{_datadir}/%{name}/fw_nm.*
+%{_datadir}/%{name}/gtk_*
+%{_datadir}/%{name}/*.glade
+%attr(755,root,root) %{_datadir}/%{name}/system-config-firewall-mechanism.*
 %{_desktopdir}/system-config-firewall.desktop
 %{_iconsdir}/hicolor/*/apps/preferences-system-firewall*.*
 
 %files base -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/lokkit
-%attr(755,root,root) %{_datadir}/system-config-firewall/convert-config
-%dir %{_datadir}/system-config-firewall
+%attr(755,root,root) %{_datadir}/%{name}/convert-config
+%dir %{_datadir}/%{name}
 %defattr(0644,root,root)
-%{_datadir}/system-config-firewall/etc_services.*
-%{_datadir}/system-config-firewall/fw_compat.*
-%{_datadir}/system-config-firewall/fw_config.*
-%{_datadir}/system-config-firewall/fw_firewalld.*
-%{_datadir}/system-config-firewall/fw_functions.*
-%{_datadir}/system-config-firewall/fw_icmp.*
-%{_datadir}/system-config-firewall/fw_iptables.*
-%{_datadir}/system-config-firewall/fw_lokkit.*
-%{_datadir}/system-config-firewall/fw_parser.*
-%{_datadir}/system-config-firewall/fw_selinux.*
-%{_datadir}/system-config-firewall/fw_services.*
-%{_datadir}/system-config-firewall/fw_sysconfig.*
-%{_datadir}/system-config-firewall/fw_sysctl.*
+%{_datadir}/%{name}/etc_services.*
+%{_datadir}/%{name}/fw_compat.*
+%{_datadir}/%{name}/fw_config.*
+%{_datadir}/%{name}/fw_firewalld.*
+%{_datadir}/%{name}/fw_functions.*
+%{_datadir}/%{name}/fw_icmp.*
+%{_datadir}/%{name}/fw_iptables.*
+%{_datadir}/%{name}/fw_lokkit.*
+%{_datadir}/%{name}/fw_parser.*
+%{_datadir}/%{name}/fw_selinux.*
+%{_datadir}/%{name}/fw_services.*
+%{_datadir}/%{name}/fw_sysconfig.*
+%{_datadir}/%{name}/fw_sysctl.*
 %ghost %config(missingok,noreplace) %verify(not md5 mtime size) /etc/sysconfig/system-config-firewall
 
 %files tui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/system-config-firewall-tui
-%{_datadir}/system-config-firewall/fw_tui.*
+%{_datadir}/%{name}/fw_tui.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -148,6 +148,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2012/03/03 11:11:21  glen
+- more macros
+
 Revision 1.5  2012/03/03 11:11:11  glen
 - killall todo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/system-config-firewall/system-config-firewall.spec?r1=1.5&r2=1.6&f=u