Fixed the paths in /etc/opt and /var/opt (missing /scls/)
Spec: automatically apply all the patches in dist-git
This commit is contained in:
parent
b88a75e929
commit
0cf460bd64
@ -0,0 +1,30 @@
|
|||||||
|
From 2d94a156c27f53301c0cda8075e1af3115fbdaa4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Zeleny <jzeleny@redhat.com>
|
||||||
|
Date: Wed, 27 Aug 2014 14:20:16 +0200
|
||||||
|
Subject: [PATCH] Add missing /scls/ to %_sharedstatedir, %_localstatedir and
|
||||||
|
%_sysconfdir
|
||||||
|
|
||||||
|
---
|
||||||
|
macros.scl | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/macros.scl b/macros.scl
|
||||||
|
index f4eac508a77970d8c7df708f0b6f364f84f4d0b0..094bde95d390640fb070424b50d31b0a495c732c 100644
|
||||||
|
--- a/macros.scl
|
||||||
|
+++ b/macros.scl
|
||||||
|
@@ -67,9 +67,9 @@ package or when debugging this package.
|
||||||
|
%global _sbindir %{_exec_prefix}/sbin
|
||||||
|
%global _libexecdir %{_exec_prefix}/libexec
|
||||||
|
%global _datadir %{_prefix}/share
|
||||||
|
-%global _sysconfdir %{_root_sysconfdir}/opt/%{scl_vendor}/%{scl}
|
||||||
|
-%global _sharedstatedir %{_root_localstatedir}/opt/%{scl_vendor}/%{scl}/lib
|
||||||
|
-%global _localstatedir %{_root_localstatedir}/opt/%{scl_vendor}/%{scl}
|
||||||
|
+%global _sysconfdir %{_root_sysconfdir}/opt/%{scl_vendor}/scls/%{scl}
|
||||||
|
+%global _sharedstatedir %{_root_localstatedir}/opt/%{scl_vendor}/scls/%{scl}/lib
|
||||||
|
+%global _localstatedir %{_root_localstatedir}/opt/%{scl_vendor}/scls/%{scl}
|
||||||
|
%global _libdir %{_exec_prefix}/%{_lib}
|
||||||
|
%global _includedir %{_prefix}/include
|
||||||
|
%global _infodir %{_datadir}/info
|
||||||
|
--
|
||||||
|
1.9.3
|
||||||
|
|
@ -1,12 +1,13 @@
|
|||||||
Summary: Utilities for alternative packaging
|
Summary: Utilities for alternative packaging
|
||||||
Name: scl-utils
|
Name: scl-utils
|
||||||
Version: 20140815
|
Version: 20140815
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Applications/File
|
Group: Applications/File
|
||||||
URL: https://fedorahosted.org/SoftwareCollections/
|
URL: https://fedorahosted.org/SoftwareCollections/
|
||||||
Source0: https://fedorahosted.org/released/scl-utils/%{name}-%{version}.tar.gz
|
Source0: https://fedorahosted.org/released/scl-utils/%{name}-%{version}.tar.gz
|
||||||
Source1: macros.scl-filesystem
|
Source1: macros.scl-filesystem
|
||||||
|
%{lua: i=0; for p in posix.files() do if string.match(p, "%d+.*%.patch$") then print(string.format("Patch%u: %s\n", i, p)); i=i+1; end end}
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -70,6 +71,10 @@ rm -rf %buildroot
|
|||||||
%{_rpmconfigdir}/brp-scl-python-bytecompile
|
%{_rpmconfigdir}/brp-scl-python-bytecompile
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 27 2014 Jan Zeleny <jzeleny@redhat.com> - 20140815-2
|
||||||
|
- fixed the paths in /etc/opt and /var/opt (missing /scls/)
|
||||||
|
- adjust the spec so all patches are automatically applied
|
||||||
|
|
||||||
* Tue Aug 26 2014 Jan Zeleny <jzeleny@redhat.com> - 20140815-1
|
* Tue Aug 26 2014 Jan Zeleny <jzeleny@redhat.com> - 20140815-1
|
||||||
- rebased to 20140815
|
- rebased to 20140815
|
||||||
- switched to %autosetup in %prep
|
- switched to %autosetup in %prep
|
||||||
|
Loading…
Reference in New Issue
Block a user