[iguanaIR] Fixes #1159618, re-install logrotate file.
leamas
leamas at fedoraproject.org
Wed Dec 10 15:37:27 UTC 2014
commit e483b3e8d92abf22ac70e15f971dd0f641f70871
Author: Alec Leamas <leamas.alec at gmail.com>
Date: Wed Dec 10 16:35:52 2014 +0100
Fixes #1159618, re-install logrotate file.
iguanaIR.logrotate | 2 +-
iguanaIR.spec | 23 ++++++++++++++---------
2 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/iguanaIR.logrotate b/iguanaIR.logrotate
index ce609ad..8f51ca5 100644
--- a/iguanaIR.logrotate
+++ b/iguanaIR.logrotate
@@ -1,4 +1,4 @@
-/var/log/iguanaIR {
+/var/log/iguanaIR/*.log {
missingok
notifempty
postrotate
diff --git a/iguanaIR.spec b/iguanaIR.spec
index eb47a99..ab11114 100644
--- a/iguanaIR.spec
+++ b/iguanaIR.spec
@@ -1,6 +1,6 @@
Name: iguanaIR
Version: 1.1.0
-Release: 11%{?dist}
+Release: 12%{?dist}
Epoch: 2
Summary: Driver for Iguanaworks USB IR transceiver
@@ -12,6 +12,7 @@ Source1: iguanaIR.service
Source2: iguanaIR-rescan
Source3: README.fedora
Source4: patch-soname
+Source5: iguanaIR.logrotate
# https://iguanaworks.net/projects/IguanaIR/ticket/317
Patch1: changeset_2710.patch
Patch2: rpath.patch
@@ -111,10 +112,7 @@ bash -c "./patch-soname $RPM_BUILD_ROOT%{_libdir}/libiguanaIR.so.0.3 \
# fix missing links
pushd $RPM_BUILD_ROOT%{_libdir}
-#ln -s libiguanaIR.so.0.3 libiguanaIR.so.0
-
-#ln -s libiguanaIR.so.0.3 libiguanaIR.so
-
+ln -sf libiguanaIR.so.0.3 libiguanaIR.so.0
# Use /etc/sysconfig instead of /etc/default
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig || :
@@ -138,7 +136,9 @@ install -m755 -d $RPM_BUILD_ROOT/etc/tmpfiles.d
cat > $RPM_BUILD_ROOT/etc/tmpfiles.d/%{name}.conf <<EOF
d /run/%{name} 0755 iguanair iguanair
EOF
-install -m755 -d $RPM_BUILD_ROOT/run/%{name}
+install -m 755 -d $RPM_BUILD_ROOT/run/%{name}
+install -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+
%pre
@@ -182,10 +182,11 @@ fi
%{_libdir}/%{name}/*.so
%{_libexecdir}/%{name}/
%{_unitdir}/%{name}.service
+/etc/logrotate.d/%{name}
/lib/udev/rules.d/80-%{name}.rules
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
-%attr(755, iguanair, iguanair) /run/%{name}
+%config(noreplace) /etc/sysconfig/%{name}
+%config(noreplace) /etc/tmpfiles.d/%{name}.conf
+%ghost %attr(755, iguanair, iguanair) /run/%{name}
%attr(775, iguanair, iguanair) %{_localstatedir}/log/%{name}
%files devel
@@ -200,6 +201,10 @@ fi
%{_bindir}/%{name}-reflasher
%changelog
+* Wed Dec 10 2014 Alec Leamas <leamas.alec at gmail.com> - 2:1.1.0-12
+- Fixes #1159618.
+- Re-install logrotate file, mysteriously dropped sometime.
+
* Wed Sep 10 2014 Alec Leamas <leamas.alec at nowhere.net> - 2:1.1.0-11
- Fixed 64-bit provides tweak.
More information about the scm-commits
mailing list