Skip to content

Commit

Permalink
Merge w/ Fedora's spec and add mmgrok
Browse files Browse the repository at this point in the history
Also removes execute perms from spec files, and builds libksi cleanly
under COPR.
  • Loading branch information
portante committed Apr 8, 2016
1 parent d6742a4 commit 7b8a95e
Show file tree
Hide file tree
Showing 4 changed files with 244 additions and 223 deletions.
14 changes: 14 additions & 0 deletions rpmbuild/SOURCES/systemd-service.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff -up rsyslog-7.4.1/rsyslog.service.in.orig rsyslog-7.4.1/rsyslog.service.in
--- rsyslog-7.4.1/rsyslog.service.in.orig 2013-06-17 15:28:54.430023493 +0200
+++ rsyslog-7.4.1/rsyslog.service.in 2013-06-17 15:30:05.874378084 +0200
@@ -6,7 +6,9 @@ Requires=syslog.socket

[Service]
Type=notify
-ExecStart=@sbindir@/rsyslogd -n
+EnvironmentFile=-/etc/sysconfig/rsyslog
+ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS
+UMask=0066
StandardOutput=null
Restart=on-failure

2 changes: 2 additions & 0 deletions rpmbuild/SPECS/libksi1.spec
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Group: Networking/Admin
URL: http://www.rsyslog.com/
Source0: https://github.com/rsyslog/libksi/archive/libksi-%{version}.tar.gz
BuildRoot: %{_tmppath}/libksi-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: openssl-devel
BuildRequires: curl-devel
BuildRequires: ca-certificates
Expand Down
Empty file modified rpmbuild/SPECS/librdkafka.spec
100755 → 100644
Empty file.
Loading

0 comments on commit 7b8a95e

Please sign in to comment.