Attachment 909782 Details for Bug 1099377 – Patch for rawhide

[patch] Patch for rawhide

0001-Re-enable-Java-bindings-apply-newer-guidelines.patch (text/plain), 3.77 KB, created by Yaakov Selkowitz on 2014-06-17 22:07:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-17 22:07:49 UTC

Size: 3.77 KB

patch

obsolete

>From 2511948ba91008495ee24410d245c0f13bbbfe06 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Tue, 17 Jun 2014 17:06:50 -0500
>Subject: [PATCH] Re-enable Java bindings, apply newer guidelines
>
>---
> qdbm.spec | 57 ++++++++++++++++++++++++++++++---------------------------
> 1 file changed, 30 insertions(+), 27 deletions(-)
>
>diff --git a/qdbm.spec b/qdbm.spec
>index 5cef75b..e1865bb 100644
>--- a/qdbm.spec
>+++ b/qdbm.spec
>@@ -1,12 +1,6 @@
>-%if 0%{?fedora} >= 21
>-%define		enable_java	0
>-%else
>-%define		enable_java	1
>-%endif
>-
> Name:		qdbm
> Version:	1.8.78
>-Release:	13%{?dist}
>+Release:	14%{?dist}
> License:	LGPLv2+
> 
> URL:		http://fallabs.com/qdbm/
>@@ -17,16 +11,11 @@ Patch0:		qdbm-ruby-1.9-compat.patch
> BuildRequires:	zlib-devel
> BuildRequires:	bzip2-devel
> BuildRequires:	lzo-devel
>-%if 0%{?enable_java} >= 1
>-BuildRequires:	gcc-java libgcj-devel
>-%endif
>+BuildRequires:	java-devel
> # ruby-devel requires ruby-libs but not require ruby
> BuildRequires:	ruby
> BuildRequires:	ruby-devel
> BuildRequires:	perl(ExtUtils::MakeMaker)
>-%if 0%{?enable_java} < 1
>-Obsoletes:		%{name}-java < 1.8.78-13
>-%endif
> 
> Summary:	Quick Database Manager
> Group:		System Environment/Libraries
>@@ -62,10 +51,20 @@ This package contains a CGI interface for QDBM Database.
> Summary:	QDBM Database Library for Java
> Group:		System Environment/Libraries
> Requires:	%{name} = %{version}-%{release}
>+Requires:	java-headless
> 
> %description java
> This package contains a Java interface for QDBM Database library.
> 
>+%package javadoc
>+Summary:	API docs for QDBM Database Library Java interface
>+Group:		Documentation
>+BuildArch:	noarch
>+
>+%description javadoc
>+This package contains the API documentation for the QDBM Database library Java
>+interface.
>+
> 
> %package perl
> Summary:	QDBM Database Library for Perl
>@@ -157,13 +156,12 @@ pushd plus
> popd
> 
> ## 3. for java
>-%if 0%{?enable_java} >= 1
> pushd java
> %{__sed} -i.flags -e '/^CFLAGS/s|@MYOPTS@|%{optflags}|' Makefile.in
>-%configure --with-gcj
>-%{__make} JAR=%{_bindir}/fastjar JAVAC="%{_bindir}/gcj -C"
>+export JAVA_HOME=%{java_home}
>+%configure
>+%{__make} JAR=%{jar} JAVAC=%{javac}
> popd
>-%endif
> 
> ## 4. for cgi
> pushd cgi
>@@ -210,20 +208,20 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/qdbm/cgi
> rmdir $RPM_BUILD_ROOT%{_datadir}/qdbm
> 
> ## 3. for java
>-%if 0%{?enable_java} >= 1
> pushd java
>-%{__make} install DESTDIR=$RPM_BUILD_ROOT JAR=%{_bindir}/fastjar
>+%{__make} install DESTDIR=$RPM_BUILD_ROOT JAR=%{jar}
> popd
> 
>-%{__mkdir_p} $RPM_BUILD_ROOT%{_javadir}
>+%{__mkdir_p} $RPM_BUILD_ROOT%{_jnidir}
> %{__mv} -f $RPM_BUILD_ROOT%{_libdir}/*.jar \
>-	$RPM_BUILD_ROOT%{_javadir}
>+	$RPM_BUILD_ROOT%{_jnidir}
> 
>-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/qdbm/java/japidoc
>+%{__mkdir_p} $RPM_BUILD_ROOT%{_javadocdir}
>+%{__mv} $RPM_BUILD_ROOT%{_datadir}/qdbm/java/japidoc \
>+	$RPM_BUILD_ROOT%{_javadocdir}/%{name}
> %{__rm} $RPM_BUILD_ROOT%{_datadir}/qdbm/java/*.html
> rmdir $RPM_BUILD_ROOT%{_datadir}/qdbm/java
> rmdir $RPM_BUILD_ROOT%{_datadir}/qdbm
>-%endif
> 
> ## 4. for perl
> pushd perl
>@@ -325,16 +323,16 @@ popd
> %dir %{_sysconfdir}/qdbm/
> %config(noreplace) %{_sysconfdir}/qdbm/*.conf
> 
>-%if 0%{?enable_java} >= 1
> %files java
> %defattr(-, root, root,-)
>-%doc java/japidoc/
> %doc java/jspex.html
> %lang(ja) %doc java/jspex-ja.html
> 
> %{_libdir}/libjqdbm.so*
>-%{_javadir}/*.jar
>-%endif
>+%{_jnidir}/*.jar
>+
>+%files javadoc
>+%doc %{_javadocdir}/%{name}/
> 
> %files perl
> %defattr(-, root, root, -)
>@@ -373,6 +371,11 @@ popd
> 
> 
> %changelog
>+* Mon Jun 16 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.8.78-14
>+- Re-enable Java bindings using openjdk
>+- Move jar to %%_jnidir and javadocs to %%_javadocdir
>+- Add javadoc package per current Java packaging guidelines
>+
> * Thu Jun 12 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.8.78-13
> - F-21: disable java due to gcc-java vanishment
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1099377: 909782