[lightning/f20] Fix misplaced texinfo-install scriptlets (#1135042)
Jochen Schmitt
s4504kr at fedoraproject.org
Fri Aug 29 16:46:28 UTC 2014
commit efa2941f437de43d6c363810f4a1bc50694a9150
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Fri Aug 29 18:46:31 2014 +0200
Fix misplaced texinfo-install scriptlets (#1135042)
lightning-2.0.4-info.patch | 26 ++++++++++++++++++++++++++
lightning.spec | 16 +++++++++++-----
2 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/lightning-2.0.4-info.patch b/lightning-2.0.4-info.patch
new file mode 100644
index 0000000..e825d33
--- /dev/null
+++ b/lightning-2.0.4-info.patch
@@ -0,0 +1,26 @@
+diff -U0 lightning-2.0.4/ChangeLog.inf lightning-2.0.4/ChangeLog
+diff -up lightning-2.0.4/doc/body.texi.inf lightning-2.0.4/doc/body.texi
+--- lightning-2.0.4/doc/body.texi.inf 2014-04-05 00:42:47.000000000 +0200
++++ lightning-2.0.4/doc/body.texi 2014-08-29 18:29:51.636654481 +0200
+@@ -1,4 +1,11 @@
+ @ifnottex
++ at dircategory Software development
++ at direntry
++* lightning: (lightning). Library for dynamic code generation.
++ at end direntry
++ at end ifnottex
++
++ at ifnottex
+ @node Top
+ @top @lightning{}
+
+diff -up lightning-2.0.4/doc/version.texi.inf lightning-2.0.4/doc/version.texi
+--- lightning-2.0.4/doc/version.texi.inf 2014-04-06 00:37:34.000000000 +0200
++++ lightning-2.0.4/doc/version.texi 2014-08-29 18:29:51.637654464 +0200
+@@ -1,4 +1,4 @@
+- at set UPDATED 24 January 2013
+- at set UPDATED-MONTH January 2013
++ at set UPDATED 29 August 2014
++ at set UPDATED-MONTH August 2014
+ @set EDITION 2.0.4
+ @set VERSION 2.0.4
diff --git a/lightning.spec b/lightning.spec
index bfa85c7..7c7eb2d 100644
--- a/lightning.spec
+++ b/lightning.spec
@@ -1,12 +1,14 @@
Name: lightning
Version: 2.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for generating assembly code on run time
Group: Development/Libraries
License: LGPLv2+
URL: http://www.gnu.org/software/lightning/lightning.html
Source0: ftp://ftp.gnu.org/gnu/lightning/lightning-%{version}.tar.gz
+# Backport from upstream git repository to fix BZ #1135042
+Patch1: lightning-2.0.4-info.patch
BuildRequires: binutils-devel
BuildRequires: prelink
@@ -29,6 +31,7 @@ ligthing package
%prep
%setup -q
+%patch1 -p1 -b .inf
%build
%configure
@@ -45,12 +48,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT/%{_infodir}/dir
-%post
-/sbin/install-info %{_infodir}/lightning.info %{_infodir}/dir || :
+%post devel
+/sbin/install-info %{_infodir}/lightning.info.gz %{_infodir}/dir || :
-%preun
+%preun devel
if [ $1 = 0 ]; then
- /sbin/install-info --delete %{_infodir}/lightning.info %{_infodir}/dir || :
+ /sbin/install-info --delete %{_infodir}/lightning.info.gz %{_infodir}/dir || :
fi
%files
@@ -66,6 +69,9 @@ fi
%{_infodir}/lightning.info.gz
%changelog
+* Thu Aug 28 2014 Jochen Schmitt <Jochen herr-schmitt de> - 2.0.4-2
+- Fix misplaced texinfo-install scriptlets (#1135042)
+
* Tue Apr 15 2014 Jochen Schmitt <Jochen herr-schmitt de> - 2.0.4-1
- New upstream release
More information about the scm-commits
mailing list