From cceba71427ad741eb30d219e414e08caa5e691d448e9a7292336a91ce5ebcc71 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 10 Sep 2014 10:19:34 +0000 Subject: [PATCH 1/2] - fix /etc/rpm/macros.lua51 perms OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua51?expand=0&rev=7 --- lua51.changes | 5 +++++ lua51.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lua51.changes b/lua51.changes index 00782b2..49caf96 100644 --- a/lua51.changes +++ b/lua51.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 10 10:20:31 UTC 2014 - pgajdos@suse.com + +- fix /etc/rpm/macros.lua51 perms + ------------------------------------------------------------------- Thu May 1 06:59:04 UTC 2014 - mailaender@opensuse.org diff --git a/lua51.spec b/lua51.spec index 46818f7..66dd877 100644 --- a/lua51.spec +++ b/lua51.spec @@ -124,7 +124,7 @@ for file in lua luac ; do done install -d -m 0755 %{buildroot}%{_libdir}/lua/%{major_version} install -d -m 0755 %{buildroot}%{_datadir}/lua/%{major_version} -install -D %{SOURCE1} %buildroot/etc/rpm/macros.lua51 +install -D -m 644 %{SOURCE1} %buildroot/etc/rpm/macros.lua51 # Debian/Ubuntu/SteamOS/Arch Linux compatibility ln -s %{_libdir}/liblua.so.%{major_version} %{buildroot}%{_libdir}/liblua%{major_version}.so.0 From dcd1236149b13960758017b6ffef14d0ed97adbc3579d346ef953d1a47170761 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 12 Sep 2014 09:17:52 +0000 Subject: [PATCH 2/2] - fix update-alternatives OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua51?expand=0&rev=8 --- lua51.changes | 5 +++++ lua51.spec | 24 +++++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/lua51.changes b/lua51.changes index 49caf96..a04bc76 100644 --- a/lua51.changes +++ b/lua51.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 12 09:18:50 UTC 2014 - pgajdos@suse.com + +- fix update-alternatives + ------------------------------------------------------------------- Wed Sep 10 10:20:31 UTC 2014 - pgajdos@suse.com diff --git a/lua51.spec b/lua51.spec index 66dd877..a71f8bc 100644 --- a/lua51.spec +++ b/lua51.spec @@ -118,9 +118,15 @@ make %{?_smp_mflags} -C src CC="%{__cc}" MYCFLAGS="%{optflags} -fPIC -DLUA_USE_L %install make install INSTALL_TOP="%{buildroot}%{_prefix}" INSTALL_LIB="%{buildroot}%{_libdir}" INSTALL_CMOD=%{buildroot}%{_libdir}/lua/%{major_version} INSTALL_MAN="%{buildroot}%{_mandir}/man1" install -D -m644 etc/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua.pc +# update-alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives for file in lua luac ; do mv "%{buildroot}%{_bindir}/${file}" "%{buildroot}%{_bindir}/${file}%{major_version}" + touch "%{buildroot}%{_sysconfdir}/alternatives/${file}" + ln -sf "%{_sysconfdir}/alternatives/${file}" "%{buildroot}%{_bindir}/${file}" mv "%{buildroot}%{_mandir}/man1/${file}.1" "%{buildroot}%{_mandir}/man1/${file}%{major_version}.1" + touch "%{buildroot}%{_sysconfdir}/alternatives/${file}.1.gz" + ln -sf "%{_sysconfdir}/alternatives/${file}.1.gz" "%{buildroot}%{_mandir}/man1/${file}.1.gz" done install -d -m 0755 %{buildroot}%{_libdir}/lua/%{major_version} install -d -m 0755 %{buildroot}%{_datadir}/lua/%{major_version} @@ -149,15 +155,23 @@ fi %files %defattr(-,root,root) %doc COPYRIGHT HISTORY README -%{_mandir}/man1/lua%{major_version}.1* -%{_mandir}/man1/luac%{major_version}.1* -%{_prefix}/bin/lua%{major_version} -%{_prefix}/bin/luac%{major_version} +%{_bindir}/lua%{major_version} +%{_bindir}/luac%{major_version} +%{_mandir}/man1/lua%{major_version}.1.gz +%{_mandir}/man1/luac%{major_version}.1.gz +%{_bindir}/lua +%{_bindir}/luac +%{_mandir}/man1/lua.1.gz +%{_mandir}/man1/luac.1.gz +%ghost %{_sysconfdir}/alternatives/lua +%ghost %{_sysconfdir}/alternatives/luac +%ghost %{_sysconfdir}/alternatives/lua.1.gz +%ghost %{_sysconfdir}/alternatives/luac.1.gz +%{_sysconfdir}/rpm/macros.lua51 %dir %{_libdir}/lua %dir %{_libdir}/lua/%{major_version} %dir %{_datadir}/lua %dir %{_datadir}/lua/%{major_version} -/etc/rpm/macros.lua51 %files -n liblua5_1 %defattr(-,root,root)