[packages/libjit] - added format patch (fixes build with -Werror=format-security) - added info patch (unify @direntry)

qboosh qboosh at pld-linux.org
Sat Dec 13 17:21:06 CET 2014 

commit 7e0c6cbfea08567c82f5ac4cb8c4eceb31c48ac1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 13 17:21:43 2014 +0100

    - added format patch (fixes build with -Werror=format-security)
    - added info patch (unify @direntry)
    - added am patch (fixes tests with recent automake)
    - fixed pl description

 libjit-am.patch     |  8 +++++++
 libjit-format.patch | 18 +++++++++++++++
 libjit-info.patch   | 25 +++++++++++++++++++++
 libjit.spec         | 65 ++++++++++++++++++++++++++++++++++++++---------------
 4 files changed, 98 insertions(+), 18 deletions(-)
---
diff --git a/libjit.spec b/libjit.spec
index d80b3e0..4575331 100644
--- a/libjit.spec
+++ b/libjit.spec
@@ -1,16 +1,24 @@
+#
+# Conditional build:
+%bcond_without	tests	# "make check"
+#
 Summary:	Just-In-Time Compiler Library
 Summary(pl.UTF-8):	Biblioteka kompilatora do interpretacji kodu
 Name:		libjit
 Version:	0.1.0
-Release:	0.1
-License:	GPL
-Group:		Development/Languages
+Release:	1
+License:	GPL v2+
+Group:		Libraries
 Source0:	http://download.savannah.gnu.org/releases/dotgnu-pnet/%{name}-%{version}.tar.gz
 # Source0-md5:	d6e3f83ad74ebfc20cc47d1c8913b343
+Patch0:		%{name}-format.patch
+Patch1:		%{name}-info.patch
+Patch2:		%{name}-am.patch
 URL:		http://www.gnu.org/software/dotgnu/pnet.html
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.6
 BuildRequires:	libtool
+BuildRequires:	texinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -21,22 +29,22 @@ programmer down with language or bytecode specifics.
 Unlike other systems such as the JVM, .NET, Parrot, and LLVM, libjit
 is not a virtual machine in its own right. It is the foundation upon
 which a number of different virtual machines, dynamic scripting
-languages, etc, can be built.
+languages, etc., can be built.
 
 %description -l pl.UTF-8
 Biblioteka libjit posiada rozszerzalny zestaw bibliotek biorących
 udział w procesie kompilacji Just-In-Time, bez zmuszania programisty
-do zniżania się do poziomu języka lub bytecodu.
+do zniżania się do poziomu specyfiki języka lub bajtkodu.
 
-W przeciwieństwie do innych systemów jak JVM, .NET, Parrot lub LLVM,
-libjit nie jest normalną maszyną wirtualną. Bazuje na różnych
-maszynach wirtualnych, dynamicznych językach skryptowych które może
-budować.
+W przeciwieństwie do innych systemów (takich jak JVM, .NET, Parrot czy
+LLVM), libjit nie jest pełnoprawną maszyną wirtualną. Jest to baza, na
+której można zbudować wiele różnych maszyn wirtualnych, dynamicznych
+języków skryptowych itp.
 
 %package devel
 Summary:	Just-In-Time Compiler Library - development files
 Summary(pl.UTF-8):	Biblioteka kompilatora do interpretacji kodu - pliki dla programistów
-Group:		Development/Languages
+Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
@@ -48,7 +56,7 @@ Biblioteka kompilatora do interpretacji kodu - pliki dla programistów.
 %package static
 Summary:	Just-In-Time Compiler Library - static files
 Summary(pl.UTF-8):	Biblioteka kompilatora do interpretacji kodu - wersja statyczna
-Group:		Development/Languages
+Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
@@ -59,15 +67,22 @@ Biblioteka kompilatora do interpretacji kodu - biblioteka statyczna.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure
 %{__make}
+
+%if %{with tests}
 %{__make} check
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,25 +93,39 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p	/sbin/postshell
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
+%post	devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun	-p	/sbin/postshell
+%postun	devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
 %doc README NEWS ChangeLog AUTHORS
-%attr(755,root,root) %{_libdir}/libjit*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libjit.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libjit.so.0
+%attr(755,root,root) %{_libdir}/libjitdynamic.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libjitdynamic.so.0
+%attr(755,root,root) %{_libdir}/libjitplus.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libjitplus.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libjit*.so
-%{_libdir}/libjit*.la
+%attr(755,root,root) %{_libdir}/libjit.so
+%attr(755,root,root) %{_libdir}/libjitdynamic.so
+%attr(755,root,root) %{_libdir}/libjitplus.so
+%{_libdir}/libjit.la
+%{_libdir}/libjitdynamic.la
+%{_libdir}/libjitplus.la
 %{_includedir}/jit
-%{_mandir}/man?/*
+%{_mandir}/man3/libjit.3*
 %{_infodir}/libjit.info*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libjit*.a
+%{_libdir}/libjit.a
+%{_libdir}/libjitdynamic.a
+%{_libdir}/libjitplus.a
diff --git a/libjit-am.patch b/libjit-am.patch
new file mode 100644
index 0000000..d7bea0c
--- /dev/null
+++ b/libjit-am.patch
@@ -0,0 +1,8 @@
+--- libjit-0.1.0/tests/Makefile.am.orig	2014-12-13 16:25:39.681177519 +0100
++++ libjit-0.1.0/tests/Makefile.am	2014-12-13 16:24:18.421180929 +0100
+@@ -4,4 +4,4 @@
+ 		math.pas \
+ 		param.pas
+ EXTRA_DIST = $(TESTS)
+-TESTS_ENVIRONMENT = $(top_builddir)/dpas/dpas --dont-fold
++LOG_COMPILER = $(top_builddir)/dpas/dpas --dont-fold
diff --git a/libjit-format.patch b/libjit-format.patch
new file mode 100644
index 0000000..daa9082
--- /dev/null
+++ b/libjit-format.patch
@@ -0,0 +1,18 @@
+--- libjit-0.1.0/tools/gen-rules-parser.y.orig	2007-02-22 20:08:33.000000000 +0100
++++ libjit-0.1.0/tools/gen-rules-parser.y	2014-12-13 15:36:30.654634611 +0100
+@@ -846,13 +846,13 @@
+ 		if(*code == '$' && code[1] >= first && code[1] < (first + MAX_PATTERN))
+ 		{
+ 			index = code[1] - first;
+-			printf(names[index]);
++			printf("%s", names[index]);
+ 			code += 2;
+ 		}
+ 		else if(*code == '%' && code[1] >= first && code[1] < (first + MAX_PATTERN))
+ 		{
+ 			index = code[1] - first;
+-			printf(other_names[index]);
++			printf("%s", other_names[index]);
+ 			code += 2;
+ 		}
+ 		else if(*code == '\n')
diff --git a/libjit-info.patch b/libjit-info.patch
new file mode 100644
index 0000000..29ba8f0
--- /dev/null
+++ b/libjit-info.patch
@@ -0,0 +1,25 @@
+--- libjit-0.1.0/doc/libjit.texi.orig	2004-10-06 16:30:31.000000000 +0200
++++ libjit-0.1.0/doc/libjit.texi	2014-12-13 15:58:50.877911701 +0100
+@@ -5,9 +5,9 @@
+ @setchapternewpage off
+ @c %** end of header
+ 
+- at dircategory Libraries
++ at dircategory Libraries:
+ @direntry
+-* Libjit: (libjit).                Just-In-Time Compiler Library
++* Libjit: (libjit).			Just-In-Time Compiler Library
+ @end direntry
+ 
+ @ifinfo
+--- libjit-0.1.0/doc/libjit.texi.orig	2014-12-13 16:40:21.834473832 +0100
++++ libjit-0.1.0/doc/libjit.texi	2014-12-13 16:50:32.664448198 +0100
+@@ -23,7 +23,7 @@
+ @center @titlefont{Just-In-Time Compiler Library}
+ 
+ @vskip 0pt plus 1fill
+- at center{Copyright @copyright{} 2004 Southern Storm Software, Pty Ltd}
++ at center Copyright @copyright{} 2004 Southern Storm Software, Pty Ltd
+ @end titlepage
+ 
+ @syncodeindex fn cp
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libjit.git/commitdiff/7e0c6cbfea08567c82f5ac4cb8c4eceb31c48ac1

More information about the pld-cvs-commit mailing list