[gssproxy] 01/01: Sync package spec file with fedora

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

simo pushed a commit to branch master
in repository gssproxy.

commit c6529386f4949333c173d568b79dc06421a52891
Author: Robbie Harwood <rharwood(a)redhat.com&gt;
Date:   Wed Jan 18 19:03:26 2017 +0000

    Sync package spec file with fedora
    
    Signed-off-by: Robbie Harwood <rharwood(a)redhat.com&gt;
    Reviewed-by: Simo Sorce <simo(a)redhat.com&gt;
    Merges #41
---
 proxy/contrib/gssproxy.spec.in | 44 ++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/proxy/contrib/gssproxy.spec.in b/proxy/contrib/gssproxy.spec.in
index 22776d9..ccd3e50 100644
--- a/proxy/contrib/gssproxy.spec.in
+++ b/proxy/contrib/gssproxy.spec.in
@@ -16,18 +16,15 @@ BuildRoot:	%(mktemp -ud
%{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 ### Patches ###
 
 ### Dependencies ###
-
-Requires: krb5-libs >= 1.11.5
+Requires: krb5-libs >= 1.12.0
 Requires: keyutils-libs
-Requires: libverto-tevent
-Requires: libini_config >= 1.2.0
-
+Requires: libverto-module-base
+Requires: libini_config
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 
 ### Build Dependencies ###
-
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -38,7 +35,7 @@ BuildRequires: docbook-style-xsl
 BuildRequires: doxygen
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig
-BuildRequires: krb5-devel >= 1.11.5
+BuildRequires: krb5-devel >= 1.12.0
 BuildRequires: libselinux-devel
 BuildRequires: keyutils-libs-devel
 BuildRequires: libini_config-devel >= 1.2.0
@@ -54,6 +51,7 @@ A proxy for GSSAPI credential handling
 %prep
 %setup -q
 
+# patch
 
 %build
 autoreconf -f -i
@@ -61,7 +59,8 @@ autoreconf -f -i
     --with-pubconf-path=%{pubconfpath} \
     --with-initscript=systemd \
     --disable-static \
-    --disable-rpath
+    --disable-rpath \
+    --with-gpp-default-behavior=REMOTE_FIRST
 
 make %{?_smp_mflags} all
 make test_proxymech
@@ -73,11 +72,10 @@ rm -f %{buildroot}%{_libdir}/gssproxy/proxymech.la
 install -d -m755 %{buildroot}%{_sysconfdir}/gssproxy
 install -m644 examples/gssproxy.conf %{buildroot}%{_sysconfdir}/gssproxy/gssproxy.conf
 install -m644 examples/24-nfs-server.conf
%{buildroot}%{_sysconfdir}/gssproxy/24-nfs-server.conf
-install -m644 examples/80-httpd.conf %{buildroot}%{_sysconfdir}/gssproxy/80-httpd.conf
 install -m644 examples/99-nfs-client.conf
%{buildroot}%{_sysconfdir}/gssproxy/99-nfs-client.conf
 mkdir -p %{buildroot}%{_sysconfdir}/gss/mech.d
 install -m644 examples/mech %{buildroot}%{_sysconfdir}/gss/mech.d/gssproxy.conf
-mkdir -p %{buildroot}/var/lib/gssproxy/rcache
+mkdir -p %{buildroot}%{gpstatedir}/rcache
 
 %clean
 rm -rf %{buildroot}
@@ -85,44 +83,36 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
+%doc COPYING
 %{_unitdir}/gssproxy.service
 %{_sbindir}/gssproxy
 %attr(755,root,root) %dir %{pubconfpath}
 %attr(755,root,root) %dir %{gpstatedir}
 %attr(700,root,root) %dir %{gpstatedir}/clients
+%attr(700,root,root) %dir %{gpstatedir}/rcache
 %attr(0600,root,root) %config(noreplace) /%{_sysconfdir}/gssproxy/gssproxy.conf
 %attr(0600,root,root) %config(noreplace) /%{_sysconfdir}/gssproxy/24-nfs-server.conf
-%attr(0600,root,root) %config(noreplace) /%{_sysconfdir}/gssproxy/80-httpd.conf
 %attr(0600,root,root) %config(noreplace) /%{_sysconfdir}/gssproxy/99-nfs-client.conf
 %attr(0644,root,root) %config(noreplace) /%{_sysconfdir}/gss/mech.d/gssproxy.conf
-%attr(700,root,root) %dir /var/lib/gssproxy/rcache
 %{_libdir}/gssproxy/proxymech.so
 %{_mandir}/man5/gssproxy.conf.5*
 %{_mandir}/man8/gssproxy.8*
 %{_mandir}/man8/gssproxy-mech.8*
 
 %post
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post gssproxy.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable gssproxy.service > /dev/null 2>&1 || :
-    /bin/systemctl stop gssproxy.service > /dev/null 2>&1 || :
-fi
+%systemd_preun gssproxy.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart gssproxy.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart gssproxy.service
 
 %changelog
-* Fri Mar 22 2013 Guenther Deschner <gdeschner(a)redhat.com&gt; -
@PACKAGE_VERSION@-0@PRERELEASE_VERSION@
+* Wed Jan 18 2017 Robbie Harwood <rharwood(a)redhat.com&gt; -
@PACKAGE_VERSION@-0@PRERELEASE_VERSION@
+- Resync with fedora
+
+* Fri Mar 22 2013 Guenther Deschner <gdeschner(a)redhat.com&gt; - 0.5.1-3
 - Various specfile and packaging fixes
 - Add systemd packaging
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.