#72 mark net.properties as a config file
Merged 4 years ago by jerboaa. Opened 4 years ago by cyberpear.
rpms/ cyberpear/java-1.8.0-openjdk config-net.properties  into  master

file modified
+6 -2
@@ -689,6 +689,7 @@ 

  %{_jvmdir}/%{jredir -- %{?1}}/lib/jvm.hprof.txt

  %{_jvmdir}/%{jredir -- %{?1}}/lib/meta-index

  %{_jvmdir}/%{jredir -- %{?1}}/lib/net.properties

+ %config(noreplace) %{etcjavadir -- %{?1}}/lib/net.properties

  %{_jvmdir}/%{jredir -- %{?1}}/lib/psfont.properties.ja

  %{_jvmdir}/%{jredir -- %{?1}}/lib/psfontj2d.properties

  %{_jvmdir}/%{jredir -- %{?1}}/lib/resources.jar
@@ -985,7 +986,7 @@ 

  

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

  Version: %{javaver}.%{updatever}.%{buildver}

- Release: 1%{?dist}

+ Release: 2%{?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
@@ -2058,7 +2059,7 @@ 

  # moving config files to /etc

  mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib/security/policy/unlimited/

  mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib/security/policy/limited/

- for file in lib/security/cacerts lib/security/policy/unlimited/US_export_policy.jar lib/security/policy/unlimited/local_policy.jar lib/security/policy/limited/US_export_policy.jar lib/security/policy/limited/local_policy.jar lib/security/java.policy lib/security/java.security lib/security/blacklisted.certs lib/logging.properties lib/calendars.properties lib/security/nss.cfg ; do

+ for file in lib/security/cacerts lib/security/policy/unlimited/US_export_policy.jar lib/security/policy/unlimited/local_policy.jar lib/security/policy/limited/US_export_policy.jar lib/security/policy/limited/local_policy.jar lib/security/java.policy lib/security/java.security lib/security/blacklisted.certs lib/logging.properties lib/calendars.properties lib/security/nss.cfg lib/net.properties ; do

    mv      $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/$file   $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/$file

    ln -sf  %{etcjavadir -- $suffix}/$file                          $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/$file

  done
@@ -2269,6 +2270,9 @@ 

  %endif

  

  %changelog

+ * Wed May 15 2019 James Cassell <cyberpear@fedoraproject.org> - 1:1.8.0.212.b04-2

+ - mark net.properties as a config file

+ 

  * Mon May 13 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.212.b04-1

  - Update patch for RH1566890.

    - Renamed rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639 to

proxy configuration goes into the net.properties file. This should be retained across package updates.

This looks OK to me. Please bump Release number and add a changelog entry as well.

rebased onto 9ae2349b0c5926a86d2f2f38fbde2a14c1e6abd0

4 years ago

rebased onto 554136c

4 years ago

Metadata Update from @jerboaa:
- Request assigned

4 years ago

Pull-Request has been merged by jerboaa

4 years ago