[mcstrans] Update to latest version/applying patches

Daniel J Walsh dwalsh at fedoraproject.org
Tue Oct 15 17:31:56 UTC 2013


commit 7d761d4e01fd0cce31dc743080250aa08830844a
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Tue Oct 15 13:31:52 2013 -0400

    Update to latest version/applying patches
    
    - Move binary to /usr/sbin rather then /sbin
    - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

 mcstrans.spec |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/mcstrans.spec b/mcstrans.spec
index 4eb791a..217264c 100644
--- a/mcstrans.spec
+++ b/mcstrans.spec
@@ -1,15 +1,11 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
-Version: 0.3.3
-Release: 8%{?dist}
+Version: 0.3.4
+Release: 1%{?dist}
 License: GPL+
 Group: System Environment/Daemons
 Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz
 Source1: mcstransd.service
-Patch: mcstrans-0.3.2-writepid.patch
-Patch1: mcstrans-0.3.3-inotify.patch
-Patch2: mcstrans-0.3.3-man.patch
-Patch3: mcstrans-0.3.3-memory.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libselinux-devel >= 1.30.3-1
 BuildRequires: libcap-devel pcre-devel libsepol-devel libsepol-static
@@ -37,14 +33,10 @@ from internal representations to user defined representation.
 
 %prep
 %setup -q
-%patch -p1 -b .writepid
-%patch1 -p1 -b .inotify
-%patch2 -p1 -b .man
-%patch3 -p1 -b .memory
 
 %build
 make clean
-make LIBDIR="%{_libdir}" CFLAGS="-g %{optflags}" %{?_smp_mflags}
+make LIBDIR="%{_libdir}" CFLAGS="-g %{optflags}" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -53,8 +45,7 @@ mkdir -p %{buildroot}/%{_libdir}
 mkdir -p %{buildroot}%{_usr}/share/mcstrans
 mkdir -p %{buildroot}%{_sysconfdir}/selinux/mls/setrans.d
 
-make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" install
-rm -f %{buildroot}%{_sbindir}/*
+make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" SBINDIR="%{buildroot}%{_sbindir}" install
 rm -f %{buildroot}%{_libdir}/*.a
 cp -r share/* %{buildroot}%{_usr}/share/mcstrans/
 # Systemd 
@@ -88,7 +79,7 @@ fi
 %{_mandir}/man8/mcstransd.8.gz
 %{_mandir}/man8/setrans.conf.8.gz
 %{_mandir}/man8/secolor.conf.8.gz
-/sbin/mcstransd
+/usr/sbin/mcstransd
 %{_unitdir}/mcstransd.service
 %dir %{_sysconfdir}/selinux/mls/setrans.d
 
@@ -103,6 +94,9 @@ fi
 %{_usr}/share/mcstrans/util/*
 
 %changelog
+* Thu Sep 12 2013 Dan Walsh <dwalsh at redhat.com> - 0.3.4-1
+- Update to latest version/applying patches
+- Move binary to /usr/sbin rather then /sbin
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list