[glite-lb-logger] New release 2.4.23 (L&B 4.1.2), delete old patches.
František Dvořák
valtri at fedoraproject.org
Thu Jun 26 20:33:17 UTC 2014
commit 9afda889940db39d9400b2dbf1260aeffb39c3b1
Author: František Dvořák <valtri at civ.zcu.cz>
Date: Thu Jun 26 22:28:54 2014 +0200
New release 2.4.23 (L&B 4.1.2), delete old patches.
.gitignore | 1 +
glite-lb-logger.spec | 27 +++++----
rpath.patch | 17 ------
sbin.patch | 154 --------------------------------------------------
sources | 2 +-
5 files changed, 18 insertions(+), 183 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 53402f6..e3b8a25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/glite-lb-logger-2.4.21.tar.gz
/glite-lb-logger-2.4.22.tar.gz
+/glite-lb-logger-2.4.23.tar.gz
diff --git a/glite-lb-logger.spec b/glite-lb-logger.spec
index 28e5452..e082ca6 100644
--- a/glite-lb-logger.spec
+++ b/glite-lb-logger.spec
@@ -1,8 +1,8 @@
%global _hardened_build 1
Name: glite-lb-logger
-Version: 2.4.22
-Release: 2%{?dist}
+Version: 2.4.23
+Release: 1%{?dist}
Summary: gLite Logging and Bookkeeping local-logger and inter-loggers
License: ASL 2.0
@@ -59,21 +59,21 @@ CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smp_mflags}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
%if 0%{?rhel} >= 7 || 0%{?fedora}
# preserve directory in /var/run
-mkdir -p ${RPM_BUILD_ROOT}%{_tmpfilesdir}
-cat > ${RPM_BUILD_ROOT}%{_tmpfilesdir}/glite-lb-logger.conf <<EOF
+mkdir -p %{buildroot}%{_tmpfilesdir}
+cat > %{buildroot}%{_tmpfilesdir}/glite-lb-logger.conf <<EOF
d %{_localstatedir}/run/glite 0755 glite glite -
EOF
%else
-sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/rc.d/init.d/glite-lb-locallogger
+sed -i 's,\(lockfile=/var/lock\),\1/subsys,' %{buildroot}/etc/rc.d/init.d/glite-lb-locallogger
%endif
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/glite
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/glite
-touch $RPM_BUILD_ROOT%{_localstatedir}/run/glite/glite-lb-interlogger.sock
-touch $RPM_BUILD_ROOT%{_localstatedir}/run/glite/glite-lb-notif.sock
-touch $RPM_BUILD_ROOT%{_localstatedir}/run/glite/glite-lb-proxy.sock
+mkdir -p %{buildroot}%{_localstatedir}/lib/glite
+mkdir -p %{buildroot}%{_localstatedir}/run/glite
+touch %{buildroot}%{_localstatedir}/run/glite/glite-lb-interlogger.sock
+touch %{buildroot}%{_localstatedir}/run/glite/glite-lb-notif.sock
+touch %{buildroot}%{_localstatedir}/run/glite/glite-lb-proxy.sock
%pre
@@ -168,11 +168,16 @@ fi
%changelog
+* Thu Jun 26 2014 František Dvořák <valtri at civ.zcu.cz> - 2.4.23-1
+- New release 2.4.23 (L&B 4.1.2)
+- Consistent style with buildroot macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sat May 31 2014 František Dvořák <valtri at civ.zcu.cz> - 2.4.22-1
- New release 2.4.22 (L&B 4.1.1)
+- Rpath and sbin patches in upstream
* Mon Jan 13 2014 František Dvořák <valtri at civ.zcu.cz> - 2.4.21-2
- Missing directory
diff --git a/sources b/sources
index 34d86c5..e658631 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14f2f8ade609f187fe3a7fcedef715d4 glite-lb-logger-2.4.22.tar.gz
+54b37003a64538e5651d04ff1f886f1e glite-lb-logger-2.4.23.tar.gz
More information about the scm-commits
mailing list