[gogoc] Fix selinux-policy dependency and fix patches to apply cleanly

[Juan Orti]

commit a08357641974c82f086b8589d4b94ea8411a927b
Author: Juan Orti Alcaine <jorti at fedoraproject.org>
Date:   Thu Aug 22 09:13:12 2013 +0200

    Fix selinux-policy dependency and fix patches to apply cleanly

 ...output_scraping_to_match_current_ifconfig.patch |    8 +++---
 gogoc.spec                                         |   26 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/gogoc-1.2-bz983052_adjust_output_scraping_to_match_current_ifconfig.patch b/gogoc-1.2-bz983052_adjust_output_scraping_to_match_current_ifconfig.patch
index a5c2453..3b9016e 100644
--- a/gogoc-1.2-bz983052_adjust_output_scraping_to_match_current_ifconfig.patch
+++ b/gogoc-1.2-bz983052_adjust_output_scraping_to_match_current_ifconfig.patch
@@ -1,8 +1,8 @@
 diff --git a/gogoc-tsp/template/linux.sh b/gogoc-tsp/template/linux.sh
-index e7ba487..0112eb4 100644
+index 1b15eb2..d056ef4 100644
 --- a/gogoc-tsp/template/linux.sh
 +++ b/gogoc-tsp/template/linux.sh
-@@ -159,7 +159,7 @@ if [ X"${TSP_OPERATION}" = X"TSP_TUNNEL_TEARDOWN" ]; then
+@@ -166,7 +166,7 @@ if [ X"${TSP_OPERATION}" = X"TSP_TUNNEL_TEARDOWN" ]; then
  
        Delete interface IPv6 configuration.
        PREF=`echo $TSP_CLIENT_ADDRESS_IPV6 | sed "s/:0*/:/g" |cut -d : -f1-2`
@@ -11,7 +11,7 @@ index e7ba487..0112eb4 100644
        if [ ! -z $OLDADDR ]; then
          ExecNoCheck $ifconfig $TSP_TUNNEL_INTERFACE inet6 del $OLDADDR
        fi
-@@ -198,7 +198,7 @@ if [ X"${TSP_HOST_TYPE}" = X"host" ] || [ X"${TSP_HOST_TYPE}" = X"router" ]; the
+@@ -205,7 +205,7 @@ if [ X"${TSP_HOST_TYPE}" = X"host" ] || [ X"${TSP_HOST_TYPE}" = X"router" ]; the
  
     # Clean-up old interface IPv6 configuration.
     PREF=`echo $TSP_CLIENT_ADDRESS_IPV6 | sed "s/:0*/:/g" |cut -d : -f1-2`
@@ -20,7 +20,7 @@ index e7ba487..0112eb4 100644
     if [ ! -z $OLDADDR ]; then
        Display 1 "Removing old IPv6 address $OLDADDR"
        Exec $ifconfig $TSP_TUNNEL_INTERFACE inet6 del $OLDADDR
-@@ -241,7 +241,7 @@ if [ X"${TSP_HOST_TYPE}" = X"router" ]; then
+@@ -248,7 +248,7 @@ if [ X"${TSP_HOST_TYPE}" = X"router" ]; then
     fi
  
     # Add prefix::1 on advertising interface. Clean up before.
diff --git a/gogoc.spec b/gogoc.spec
index 284a2aa..cd6ee06 100644
--- a/gogoc.spec
+++ b/gogoc.spec
@@ -1,12 +1,12 @@
 %global _hardened_build 1
 %global distver 1_2-RELEASE
 %global selinux_variants mls targeted
-%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
-%global modulename gogoc
+# See: https://lists.fedoraproject.org/pipermail/devel/2013-August/188074.html
+%global selinux_policyver 3.12.1
 
 Name:           gogoc
 Version:        1.2
-Release:        30%{?dist}
+Release:        31%{?dist}
 Summary:        IPv6 TSP client for gogo6
 
 Group:          System Environment/Daemons
@@ -34,7 +34,6 @@ BuildRequires:  openssl-devel
 BuildRequires:  systemd
 BuildRequires:  checkpolicy
 BuildRequires:  selinux-policy-devel
-BuildRequires:  /usr/share/selinux/devel/policyhelp
 BuildRequires:  hardlink
 
 Requires:       radvd
@@ -42,7 +41,6 @@ Requires:       radvd
 Requires:       selinux-policy >= %{selinux_policyver}
 %endif
 Requires(post): systemd
-Requires(post): policycoreutils-python
 Requires(post): /usr/sbin/semodule
 Requires(post): /sbin/fixfiles
 Requires(preun): systemd
@@ -80,7 +78,7 @@ cd SELinux
 for selinuxvariant in %{selinux_variants}
 do
   make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
-  mv %{modulename}.pp %{modulename}.pp.${selinuxvariant}
+  mv %{name}.pp %{name}.pp.${selinuxvariant}
   make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
 done
 cd -
@@ -104,6 +102,7 @@ touch %{buildroot}%{_sharedstatedir}/%{name}/gogockeys.pub
 touch %{buildroot}%{_sharedstatedir}/%{name}/tsp-last-server.txt
 touch %{buildroot}%{_sharedstatedir}/%{name}/tsp-broker-list.txt
 touch %{buildroot}%{_localstatedir}/run/%{name}/%{name}-rtadvd.conf
+touch %{buildroot}%{_localstatedir}/run/%{name}/%{name}-tmp.log
 # Remove unneeded files
 rm -f %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf.sample
 rm -rf %{buildroot}%{_datadir}/%{name}
@@ -117,8 +116,8 @@ cd SELinux
 for selinuxvariant in %{selinux_variants}
 do
   install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
-  install -p -m 644 %{modulename}.pp.${selinuxvariant} \
-    %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp
+  install -p -m 644 %{name}.pp.${selinuxvariant} \
+    %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{name}.pp
 done
 cd -
 /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
@@ -130,7 +129,7 @@ cd -
 for selinuxvariant in %{selinux_variants}
 do
   /usr/sbin/semodule -s ${selinuxvariant} -i \
-    %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || :
+    %{_datadir}/selinux/${selinuxvariant}/%{name}.pp &> /dev/null || :
 done
 /sbin/fixfiles -R %{name} restore || :
 
@@ -144,7 +143,7 @@ done
 if [ $1 -eq 0 ] ; then
   for selinuxvariant in %{selinux_variants}
   do
-    /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || :
+    /usr/sbin/semodule -s ${selinuxvariant} -r %{name} &> /dev/null || :
   done
 fi
 
@@ -161,12 +160,17 @@ fi
 %ghost %{_sharedstatedir}/%{name}/tsp-broker-list.txt
 %dir %{_localstatedir}/run/%{name}
 %ghost %{_localstatedir}/run/%{name}/%{name}-rtadvd.conf
+%ghost %{_localstatedir}/run/%{name}/%{name}-tmp.log
 %dir %{_localstatedir}/log/%{name}
 %{_bindir}/%{name}
 %{_unitdir}/%{name}.service
-%{_datadir}/selinux/*/%{modulename}.pp
+%{_datadir}/selinux/*/%{name}.pp
 
 %changelog
+* Thu Aug 22 2013 Juan Orti Alcaine <jorti at fedoraproject.org> - 1.2-31
+- Fix selinux-policy dependency
+- Fix patches to apply cleanly
+
 * Wed Aug 21 2013 Juan Orti Alcaine <jorti at fedoraproject.org> - 1.2-30
 - Update SELinux policy to 1.0.2
 - Remove reference to strict policy