Author: glen Date: Sat Mar 3 11:06:02 2012 GMT Module: packages Tag: HEAD ---- Log message: - cleanup older apis: usermode, policykit0
---- Files affected: packages/system-config-firewall: system-config-firewall.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/system-config-firewall/system-config-firewall.spec diff -u packages/system-config-firewall/system-config-firewall.spec:1.2 packages/system-config-firewall/system-config-firewall.spec:1.3 --- packages/system-config-firewall/system-config-firewall.spec:1.2 Sat Mar 3 12:04:19 2012 +++ packages/system-config-firewall/system-config-firewall.spec Sat Mar 3 12:05:57 2012 @@ -1,14 +1,8 @@ # $Revision$, $Date$ -# -# Conditional build: -%bcond_with usermode -%bcond_with polkit0 -%bcond_without polkit1 - Summary: A graphical interface for basic firewall setup Name: system-config-firewall Version: 1.2.29 -Release: 5.5 +Release: 5.6 License: GPL v2+ Group: Base URL: http://fedorahosted.org/system-config-firewall @@ -29,15 +23,7 @@ Requires: system-config-firewall-tui = %{version}-%{release} Provides: system-config-securitylevel = 1.7.0 Obsoletes: system-config-securitylevel -%if %{with usermode} -Requires: usermode-gtk >= 1.94 -%endif -%if %{with polkit0} -Requires: python-slip-dbus >= 0.1.15 -%endif -%if %{with polkit1} Requires: python-slip-dbus >= 0.2.7 -%endif ExclusiveOS: Linux BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -77,10 +63,7 @@ %patch1 -p1 %build -%configure \ - %{?with_usermode: --enable-usermode} \ - %{?with_polkit0: --enable-policykit0} \ - %{!?with_polkit1: --disable-policykit1} +%configure %install rm -rf $RPM_BUILD_ROOT @@ -117,18 +100,10 @@ %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/system-config-firewall -%if %{with usermode} -%{_datadir}/system-config-firewall/system-config-firewall -%endif %defattr(0644,root,root) /etc/dbus-1/system.d/org.fedoraproject.Config.Firewall.conf %{_datadir}/dbus-1/system-services/org.fedoraproject.Config.Firewall.service -%if %{with polkit0} -%{_datadir}/PolicyKit/policy/org.fedoraproject.config.firewall.0.policy -%endif -%if %{with polkit1} %{_datadir}/polkit-1/actions/org.fedoraproject.config.firewall.policy -%endif %{_datadir}/system-config-firewall/fw_gui.* %{_datadir}/system-config-firewall/fw_dbus.* %{_datadir}/system-config-firewall/fw_nm.* @@ -137,10 +112,6 @@ %attr(755,root,root) %{_datadir}/system-config-firewall/system-config-firewall-mechanism.* %{_desktopdir}/system-config-firewall.desktop %{_iconsdir}/hicolor/*/apps/preferences-system-firewall*.* -%if %{with usermode} -%config /etc/security/console.apps/system-config-firewall -%config /etc/pam.d/system-config-firewall -%endif %files base -f %{name}.lang %defattr(644,root,root,755) @@ -174,6 +145,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2012/03/03 11:05:57 glen +- cleanup older apis: usermode, policykit0 + Revision 1.2 2012/03/03 11:04:19 glen - bashism fix ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/system-config-firewall/system-config-firewall.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
