Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 913485 Details for
Bug 1101069
[PATCH] fix jar installation for Java packaging guidelines
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Rebased patch
Install-jar-into-jnidir-per-latest-guidelines-1101.patch (text/plain), 5.44 KB, created by
Yaakov Selkowitz
on 2014-06-30 16:53:57 UTC
(
hide
)
Description:
Rebased patch
Filename:
MIME Type:
Creator:
Yaakov Selkowitz
Created:
2014-06-30 16:53:57 UTC
Size:
5.44 KB
patch
obsolete
>From 8928b699406460cb1f72bf18d8603031f834a598 Mon Sep 17 00:00:00 2001 >From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> >Date: Mon, 30 Jun 2014 11:51:14 -0500 >Subject: [PATCH] Install jar into %%_jnidir per latest guidelines (#1101069) > >Also: >Workaround for brp-java-repack-jars skipping top-level dot-files >Remove obsolete gtkspell BR >--- > java-gnome-4.1.3-libdir.patch | 53 +++++++++++++++++++++++++++++++++++++++++++ > java-gnome.spec | 22 ++++++++++++++---- > 2 files changed, 70 insertions(+), 5 deletions(-) > create mode 100644 java-gnome-4.1.3-libdir.patch > >diff --git a/java-gnome-4.1.3-libdir.patch b/java-gnome-4.1.3-libdir.patch >new file mode 100644 >index 0000000..1faa295 >--- /dev/null >+++ b/java-gnome-4.1.3-libdir.patch >@@ -0,0 +1,53 @@ >+Workaround for brp-java-repack-jars skipping top-level dot-files >+ >+--- java-gnome-4.1.3-orig/configure 2013-05-04 20:08:23.000000000 -0500 >++++ java-gnome-4.1.3/configure 2014-05-25 22:41:33.344932567 -0500 >+@@ -2293,7 +2293,7 @@ >+ >+ output " - native library location"; >+ >+-open LIBRARY, ">.libdir"; >++open LIBRARY, ">libdir.properties"; >+ >+ print LIBRARY <<HERE ; >+ $libdir >+--- java-gnome-4.1.3-orig/Makefile 2013-05-04 20:08:23.000000000 -0500 >++++ java-gnome-4.1.3/Makefile 2014-05-25 22:41:22.232100829 -0500 >+@@ -60,7 +60,7 @@ >+ @/bin/echo -e "INSTALL\t$@" >+ cp -f $< $@ >+ @/bin/echo -e "JAR\t$@" >+- jar uf $@ .libdir >++ jar uf $@ libdir.properties >+ @/bin/echo -e "SYMLINK\t$(@D)/gtk.jar -> gtk-$(APIVERSION).jar" >+ cd $(@D) && rm -f gtk.jar && ln -s gtk-$(APIVERSION).jar gtk.jar >+ >+@@ -114,7 +114,7 @@ >+ >+ distclean: clean >+ @/bin/echo -e "RM\tbuild configuration information" >+- -rm -f .config .config.tmp .libdir >++ -rm -f .config .config.tmp libdir.properties >+ @/bin/echo -e "RM\tgenerated documentation" >+ -rm -rf doc/api/* >+ -rm -f java-gnome-*.tar.bz2 >+--- java-gnome-4.1.3-orig/src/bindings/org/freedesktop/bindings/Plumbing.java 2013-05-04 20:08:23.000000000 -0500 >++++ java-gnome-4.1.3/src/bindings/org/freedesktop/bindings/Plumbing.java 2014-05-25 22:42:03.203480823 -0500 >+@@ -128,7 +128,7 @@ >+ } >+ } >+ >+- private static final String LIBDIR_FILE = ".libdir"; >++ private static final String LIBDIR_FILE = "libdir.properties"; >+ >+ /** >+ * Load the native library. The governing assumption is that the .jar >+@@ -171,7 +171,7 @@ >+ >+ try { >+ /* >+- * Attmept to load the .libdir file and use its contents as the >++ * Attmept to load the libdir.properties file and use its contents as the >+ * directory which we will load our shared library from. >+ */ >+ in = loader.getResourceAsStream(LIBDIR_FILE); >diff --git a/java-gnome.spec b/java-gnome.spec >index b2709df..8787a05 100644 >--- a/java-gnome.spec >+++ b/java-gnome.spec >@@ -1,9 +1,11 @@ > Summary: Java GNOME bindings > Name: java-gnome > Version: 4.1.3 >-Release: 4%{?dist} >+Release: 5%{?dist} > URL: http://java-gnome.sourceforge.net > Source0: http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.1/java-gnome-%{version}.tar.xz >+# Workaround for brp-java-repack-jars skipping top-level dot-files >+Patch0: java-gnome-4.1.3-libdir.patch > # This is the "Classpath" exception. > License: GPLv2 with exceptions > Group: System Environment/Libraries >@@ -16,7 +18,7 @@ BuildRequires: pkgconfig(glib-2.0) > BuildRequires: pkgconfig(gtk+-3.0) > BuildRequires: pkgconfig(gtk+-unix-print-3.0) > BuildRequires: pkgconfig(gtksourceview-3.0) >-BuildRequires: pkgconfig(gtkspell-2.0) >+#BuildRequires: pkgconfig(gtkspell-2.0) > BuildRequires: pkgconfig(libnotify) > BuildRequires: pkgconfig(pango) > BuildRequires: pkgconfig(librsvg-2.0) >@@ -52,6 +54,7 @@ design documentation and sample code. > > %prep > %setup -q >+%patch0 -p1 > > # Remove all binaries > find . -name "*.jar" -exec rm -f {} \; >@@ -60,7 +63,7 @@ find . -name "*.class" -exec rm -f {} \; > %build > # It'll get two conflicting --libdir parameters, but the last one > # happens to win which is what we want. >-%configure --jardir=%{_libdir}/%{name} --libdir=%{_libdir}/%{name} >+%configure --jardir=%{_jnidir} --libdir=%{_libdir}/%{name} > > # The build system does not support parallell builds, so no > # _smp_mflags. >@@ -70,8 +73,11 @@ make V=1 build-java doc > make install DESTDIR=%{buildroot} > > # Remove the versioned jar >-rm -rf %{buildroot}%{_libdir}/%{name}/gtk.jar >-mv %{buildroot}%{_libdir}/%{name}/gtk-*.jar %{buildroot}%{_libdir}/%{name}/gtk.jar >+rm -rf %{buildroot}%{_jnidir}/gtk.jar >+mv %{buildroot}%{_jnidir}/gtk-*.jar %{buildroot}%{_jnidir}/gtk.jar >+# for backwards compatibility >+mkdir -p %{buildroot}%{_libdir}/%{name} >+ln -s %{_jnidir}/gtk.jar %{buildroot}%{_libdir}/%{name}/gtk.jar > > # Install javadoc > mkdir -p %{buildroot}%{_javadocdir} >@@ -87,6 +93,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : > %dir %{_libdir}/%{name} > %{_libdir}/%{name}/*.jar > %{_libdir}/%{name}/*.so >+%{_jnidir}/gtk.jar > > %files javadoc > # Note that not all here is javadoc. Two subpackages for documentation >@@ -95,6 +102,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : > %{_javadocdir}/%{name} > > %changelog >+* Mon Jun 30 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 4.1.3-5 >+- Install jar into %%_jnidir per latest guidelines (#1101069) >+- Workaround for brp-java-repack-jars skipping top-level dot-files >+- Remove obsolete gtkspell BR >+ > * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.3-4 > - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild > >-- >1.9.3
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1101069
:
899155
| 913485