From 2d0735da96fb5967d3cf9a3515b5e9481f928d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 5 Oct 2014 12:12:12 +0200
Subject: RPM Packaging: update fileshareset

---
 redhat/extras/fileshareset/fileshareset.spec | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'redhat')

diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index face7a28a..6f76b549f 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -40,6 +40,11 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:        %{name}-%{version}.tar.gz
 
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
+
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:  gcc-c++
@@ -62,7 +67,7 @@ automake -a -c
 
 %build
 export CXXFLAGS="$CXXFLAGS -fPIE"
-export CFLAGS="$CXXFLAGS -fPIE"
+export CFLAGS="$CFLAGS -fPIE"
 export LDFLAGS="$LDFLAGS -pie"
 %configure
 %__make %{?_smp_mflags}
@@ -87,9 +92,16 @@ echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
 %files
 %defattr(-,root,root,-)
 %{_bindir}/filesharelist
-%{_bindir}/fileshareset
+%verify(not mode) %{_bindir}/fileshareset
 %{_mandir}/man8/fileshareset.8*
-%{_sysconfdir}/security/fileshare.conf
+%config(noreplace) %{_sysconfdir}/security/fileshare.conf
+
+
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%verify_permissions -e /usr/bin/fileshareset
+%endif
 
 
 %changelog
-- 
cgit v1.2.3