From 55d571074948efd50308c67dc5d1e344f79950f4 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Sep 22 2014 14:51:57 +0000 Subject: Fix rpmlint warnings - Use the standard _libdir macro instead of re-defining _libdir (and not using it). Remove unused LIBDIR macro. - Use %% to escape macros in comments. Macros in comments are evaluated too and may lead to surprises if they contain a new line. --- diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index d7c8947..fb9b424 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -74,19 +74,6 @@ %global script 'use File::Spec; print File::Spec->abs2rel($ARGV[0], $ARGV[1])' %global abs2rel %{__perl} -e %{script} -# Hard-code libdir on 64-bit architectures to make the 64-bit JDK -# simply be another alternative. -%global LIBDIR %{_libdir} -#backuped original one -%ifarch %{multilib_arches} -%global syslibdir %{_prefix}/lib64 -%global _libdir %{_prefix}/lib -%global archname %{name}.%{_arch} -%else -%global syslibdir %{_libdir} -%global archname %{name} -%endif - # Standard JPackage naming and versioning defines. %global origin openjdk %global updatever 11 @@ -135,7 +122,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 9.%{buildver}%{?dist} +Release: 10.%{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 @@ -153,8 +140,8 @@ License: ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and L URL: http://openjdk.java.net/ # Source from upstrem OpenJDK8 project. To regenerate, use -# ./generate_source_tarball.sh jdk8u jdk8u jdk8u%{updatever}-%{buildver} -# ./generate_source_tarball.sh aarch64-port %{aarch64_hg_tag} +# ./generate_source_tarball.sh jdk8u jdk8u jdk8u%%{updatever}-%%{buildver} +# ./generate_source_tarball.sh aarch64-port %%{aarch64_hg_tag} Source0: jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz Source1: aarch64-hotspot-jdk8-%{aarch64_buildver}-aarch64-%{aarch64_hg_tag}.tar.xz @@ -559,7 +546,7 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir}/images/j2sdk-image # Install java-abrt-luncher mv $JAVA_HOME/jre/bin/java $JAVA_HOME/jre/bin/java-abrt -cat %{SOURCE3} | sed -e s:@JAVA_PATH@:%{_jvmdir}/%{jredir}/bin/java-abrt:g -e s:@LIB_DIR@:%{LIBDIR}/libabrt-java-connector.so:g > $JAVA_HOME/jre/bin/java +cat %{SOURCE3} | sed -e s:@JAVA_PATH@:%{_jvmdir}/%{jredir}/bin/java-abrt:g -e s:@LIB_DIR@:%{_libdir}/libabrt-java-connector.so:g > $JAVA_HOME/jre/bin/java chmod 755 $JAVA_HOME/jre/bin/java @@ -714,7 +701,7 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \ | grep -v jre/lib/security \ | sed 's|'$RPM_BUILD_ROOT'||' \ >> %{name}.files.all -#split %{name}.files to %{name}.files-headless and %{name}.files +#split %%{name}.files to %%{name}.files-headless and %%{name}.files #see https://bugzilla.redhat.com/show_bug.cgi?id=875408 NOT_HEADLESS=\ "%{_jvmdir}/%{jredir}/lib/%{archinstall}/libjsoundalsa.so @@ -722,7 +709,7 @@ NOT_HEADLESS=\ %{_jvmdir}/%{jredir}/lib/%{archinstall}/libsplashscreen.so %{_jvmdir}/%{jredir}/lib/%{archinstall}/libawt_xawt.so %{_jvmdir}/%{jredir}/lib/%{archinstall}/libjawt.so" -#filter %{name}.files from %{name}.files.all to %{name}.files-headless +#filter %%{name}.files from %%{name}.files.all to %%{name}.files-headless ALL=`cat %{name}.files.all` for file in $ALL ; do INLCUDE="NO" ; @@ -769,10 +756,10 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \ # Create links which leads to separately installed java-atk-bridge and allow configuration # links points to java-atk-wrapper - an dependence pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/lib/%{archinstall} - ln -s %{syslibdir}/java-atk-wrapper/libatk-wrapper.so.0 libatk-wrapper.so + ln -s %{_libdir}/java-atk-wrapper/libatk-wrapper.so.0 libatk-wrapper.so popd pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/lib/ext - ln -s %{syslibdir}/java-atk-wrapper/java-atk-wrapper.jar java-atk-wrapper.jar + ln -s %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar java-atk-wrapper.jar popd pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/lib/ echo "#Config file to enable java-atk-wrapper" > accessibility.properties @@ -1122,6 +1109,10 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Wed Sep 17 2014 Omair Majid - 1:1.8.0.10-10.b26 +- Remove LIBDIR and funny definition of _libdir. +- Fix rpmlint warnings about macros in comments. + * Fri Aug 22 2014 Jiri Vanek - 1:1.8.0.11-9.b12 - fixed update to f21 - alternatrives forced to removal if there is more then one jdk even if it si update @@ -1239,7 +1230,7 @@ exit 0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild * Fri Aug 02 2013 Deepak Bhole - 1:1.8.0.0-0.15.b89 -- Added a missing includes patch (#302/%{name}-arm64-missing-includes.patch) +- Added a missing includes patch (#302/%%{name}-arm64-missing-includes.patch) - Added --disable-precompiled-headers for arm64 build * Mon Jul 29 2013 Jiri Vanek - 1:1.8.0.0-0.14.b89