#8 Fix private libraries' provides/requires filtering.
Merged 5 years ago by jvanek. Opened 5 years ago by jerboaa.
rpms/ jerboaa/java-1.8.0-openjdk master  into  master

file modified
+5 -2
@@ -98,7 +98,7 @@ 

  

  

  # fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349

- %global _privatelibs libmawt[.]so.* libattach[.]so.* libawt[.]so.* libextnet[.]so.* libjsig[.]so.* libawt_headless[.]so.* libdt_socket[.]so.* libfontmanager[.]so.* libinstrument[.]so.* libj2gss[.]so.* libj2pcsc[.]so.* libj2pkcs11[.]so.* libjaas_unix[.]so.* libjavajpeg[.]so.* libjdwp[.]so.* libjimage[.]so.* libjsound[.]so.* liblcms[.]so.* libmanagement[.]so.* libmanagement_agent[.]so.* libmanagement_ext[.]so.* libmlib_image[.]so.* libnet[.]so.* libnio[.]so.* libprefs[.]so.* librmi[.]so.* libsaproc[.]so.* libsctp[.]so.* libunpack[.]so.* libverify[.]so.* libzip[.]so.* libjsoundalsa[.]so.* libsplashscreen[.]so.* libawt_xawt[.]so.*

+ %global _privatelibs libawt_xawt[.]so.*|libjawt[.]so.*|libjsoundalsa[.]so.*|libsplashscreen[.]so.*|libjli[.]so.*|libjawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libhprof[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas_unix[.]so.*|libjava[.]so.*|libjava_crw_demo[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjsdt[.]so.*|libjsig[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libnpt[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libverify[.]so.*|libzip[.]so.*|libjsig[.]so.*|libjvm[.]so.*

  

  %global __provides_exclude ^(%{_privatelibs})$

  %global __requires_exclude ^(%{_privatelibs})$
@@ -920,7 +920,7 @@ 

  

  Name:    java-%{javaver}-%{origin}

  Version: %{javaver}.%{updatever}

- Release: 6.%{buildver}%{?dist}

+ Release: 7.%{buildver}%{?dist}

  # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons

  # and this change was brought into RHEL-4. java-1.5.0-ibm packages

  # also included the epoch in their virtual provides. This created a
@@ -2215,6 +2215,9 @@ 

  %endif

  

  %changelog

+ * Wed Jun 13 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.172-7.b11

+ - Fix reg-ex for filtering private libraries' provides/requires.

+ 

  * Wed Jun 13 2018 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.172-6.b11

  - Remove build flags exemption for aarch64 now the platform is more mature and can bootstrap OpenJDK with these flags.

  - Remove duplicate -fstack-protector-strong; it is provided by the RHEL cflags.

no initial comment

rebased onto 861523a

5 years ago

Pull-Request has been merged by jvanek

5 years ago