[sslogger] BuildRequire libgcrypt-devel (#993378).

Ville Skyttä scop at fedoraproject.org
Sat Dec 14 19:33:27 UTC 2013


commit 7e1f7c7cb94968d8e9fefdae2bc17b1f4ed00787
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Dec 14 21:33:19 2013 +0200

    BuildRequire libgcrypt-devel (#993378).
    
    - Install docs to %{_pkgdocdir} where available (#994108).
    - Fix bogus dates in %changelog.

 sslogger.spec |   50 ++++++++++++++++++++++++++++----------------------
 1 files changed, 28 insertions(+), 22 deletions(-)
---
diff --git a/sslogger.spec b/sslogger.spec
index e57f577..39f502a 100644
--- a/sslogger.spec
+++ b/sslogger.spec
@@ -1,11 +1,12 @@
 %{!?log_dir:%global log_dir %{_localstatedir}/log/slog}
 %{!?sslogger_user:%global sslogger_user slogger}
 %{!?sslogger_group:%global sslogger_group sloggers}
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Summary: A keystroke logging utility for privileged user escalation
 Name: sslogger
 Version: 0.96
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 Group: User Interface/Desktops
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -16,7 +17,7 @@ Source0: http://sourceforge.net/downloads/%{name}/%{name}-%{version}/tgz/%{name}
 Source1: sslogger-slogd-tmpfiles.conf
 Requires: bash logrotate initscripts sudo
 Requires(pre): shadow-utils util-linux gnutls
-BuildRequires: gnutls-devel 
+BuildRequires: gnutls-devel libgcrypt-devel
 %description
 A keystroke logging utility for privileged user escalation
 
@@ -47,6 +48,7 @@ chkconfig sslogger-slogd off
 %prep
 %setup -q
 make clean
+sed -i -e 's|/usr/share/doc/sslogger-\$(VERSION)|%{_pkgdocdir}|g' Makefile
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLOG_DIR=%{_localstatedir}/log/slog -DCONF_FILE=%{_sysconfdir}/sslogger.d/sslogger.conf"
@@ -88,10 +90,10 @@ rm -rf %{buildroot}
 %{_mandir}/man8/sslogger.8.gz
 %{_mandir}/man8/slog.8.gz
 
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/TODO
-%doc %{_docdir}/%{name}-%{version}/LICENSE
-%doc %{_docdir}/%{name}-%{version}/rslog
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/TODO
+%doc %{_pkgdocdir}/LICENSE
+%doc %{_pkgdocdir}/rslog
 #TLS certs
 %dir %{_sysconfdir}/pki/slog
 %dir %{_sysconfdir}/pki/slog/CA
@@ -108,13 +110,17 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/sslogger.d/tls
 %attr(775,%{sslogger_user},%{sslogger_group}) %{_localstatedir}/run/sslogger
 %{_sysconfdir}/init.d/sslogger-slogd
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/mkSlogCerts
-%doc %{_docdir}/%{name}-%{version}/README
+%doc %{_pkgdocdir}/mkSlogCerts
+%doc %{_pkgdocdir}/README
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/sslogger-slogd-tmpfiles.conf
 
 
 %changelog
+* Sat Dec 14 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.96-10
+- BuildRequire libgcrypt-devel (#993378).
+- Install docs to %%{_pkgdocdir} where available (#994108).
+- Fix bogus dates in %%changelog.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.96-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -137,25 +143,25 @@ rm -rf %{buildroot}
 * Thu Jul 1 2010 <ebrand at fedoraproject.org> 0.96-2
 - spec file typo fixes
 
-* Tue Jun 21 2010  <ebrand at fedoraproject.org> 0.96-1
-- lateset upstream release
+* Mon Jun 21 2010  <ebrand at fedoraproject.org> 0.96-1
+- latest upstream release
 - added -r "Reason" to sslogger
 - ssloger now display remote slogd server and logID
 - sslogger.c bug fixed when writing to localfile using -c and local logging disabled 
 - Config file moved to /etc/sslogger.d/sslogger.conf
 - fixed cordump when tls session is NULL
 
-* Sat Jun 8 2010 <ebrand at fedoraproject.org> 0.95-2
+* Tue Jun 8 2010 <ebrand at fedoraproject.org> 0.95-2
 - rpm row claims ownership of directory /usr/share/doc/sslogger-<version>
 
-* Mon Jun 6 2010 <edbrand at brandint.com> - 0.95-1
+* Sun Jun 6 2010 <edbrand at brandint.com> - 0.95-1
 - latest upteam release
 
-* Mon Jun 6 2010 <edbrand at brandint.com> - 0.94-4
+* Sun Jun 6 2010 <edbrand at brandint.com> - 0.94-4
 - init script fixes
 
-* Mon Jun 6 2010 <edbrand at brandint.com> - 0.94-3
-- remaned /var/run/slogd/ /var/run/sslogger
+* Sun Jun 6 2010 <edbrand at brandint.com> - 0.94-3
+- renamed /var/run/slogd/ /var/run/sslogger
 - Renamed slogd binaries sslogger-slogd to match package name
 
 * Mon May 31 2010 <edbrand at brandint.com> - 0.94-2
@@ -170,20 +176,20 @@ rm -rf %{buildroot}
 - Split sslogger-slogd into its own package
 - added -lgcrypt in Makefile
 
-* Wed Dec 29 2009 Ed Brand <edbrand at brandint.com> - 0.91-10
+* Tue Dec 29 2009 Ed Brand <edbrand at brandint.com> - 0.91-10
 - Changed $define to $global in spec file
 
-* Wed Dec 29 2009 Ed Brand <edbrand at brandint.com> - 0.91-9
+* Tue Dec 29 2009 Ed Brand <edbrand at brandint.com> - 0.91-9
 - Notify slog server and gracefully termiate tls session when 
 - running -c <cmd> with log_all_cmds=0
 
-* Wed Dec 29 2009 Ed Brand <edbrand at brandint.com> - 0.91-8
+* Tue Dec 29 2009 Ed Brand <edbrand at brandint.com> - 0.91-8
 - changed popen to dump stderr to stdout
 
-* Wed Dec 29 2009 Ed Brand <edbrand at brandint.com> - 0.91-7
+* Tue Dec 29 2009 Ed Brand <edbrand at brandint.com> - 0.91-7
 - fixed SIGPIP on server close connection
 
-* Wed Dec 29 2009 Ed Brand <edbrand at brandint.com> - 0.91-1
+* Tue Dec 29 2009 Ed Brand <edbrand at brandint.com> - 0.91-1
 - added remote tls logging and slogd server
 
 * Sun Aug 23 2009 Ed Brand <edbrand at brandint.com> - 0.9-50
@@ -206,7 +212,7 @@ rm -rf %{buildroot}
 - Chmod 775 $log_dir to allow normal user access
 - Add check to slog to disallowe passing '-' when -c option is used
 
-* Tue May 18 2009 Ed Brand <edbrand at brandint.com> - 0.9-32
+* Mon May 18 2009 Ed Brand <edbrand at brandint.com> - 0.9-32
 - removed $global
 
 * Sun Mar 29 2009 Ed Brand <edbrand at brandint.com> - 0.9-30


More information about the scm-commits mailing list