[packages/openjdk9] rename packages s/(jdk|jre|jre-X11|jar|appletviewer)$/default-$1/ s/-base//
atler
atler at pld-linux.org
Fri May 1 02:04:09 CEST 2026
commit bbcc512b4b034c448b41dd3c62e9089193256bf4
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Apr 28 18:07:06 2026 +0200
rename packages s/(jdk|jre|jre-X11|jar|appletviewer)$/default-$1/ s/-base//
openjdk9.spec | 135 +++++++++++++++++++++++++++++++---------------------------
1 file changed, 72 insertions(+), 63 deletions(-)
---
diff --git a/openjdk9.spec b/openjdk9.spec
index c3e077b..c569e17 100644
--- a/openjdk9.spec
+++ b/openjdk9.spec
@@ -91,9 +91,9 @@ BuildRequires: xorg-proto-printproto-devel
BuildRequires: xorg-proto-xproto-devel
BuildRequires: zip
BuildRequires: zlib-devel
-Requires: %{name}-appletviewer = %{version}-%{release}
-Requires: %{name}-jdk = %{version}-%{release}
-Suggests: %{name}-jre-X11
+Requires: %{name}-default-appletviewer = %{version}-%{release}
+Requires: %{name}-default-jdk = %{version}-%{release}
+Suggests: %{name}-default-jre-X11 = %{version}-%{release}
Suggests: icedtea-web
Obsoletes: icedtea6
Obsoletes: icedtea7
@@ -149,13 +149,13 @@ To jest meta-pakiet, który, za pośrednictwem zależności, dostarcza
wszystkie komponenty OpenJDK, w tym środowisko programistyczne
(OpenJDK) i uruchomieniowe (JRE).
-%package jdk
+%package default-jdk
Summary: OpenJDK - software development kit
Summary(pl.UTF-8): OpenJDK - środowisko programistyczne
Group: Development/Languages/Java
-Requires: %{name}-jar = %{version}-%{release}
-Requires: %{name}-jdk-base = %{version}-%{release}
-Requires: %{name}-jre = %{version}-%{release}
+Requires: %{name}-default-jar = %{version}-%{release}
+Requires: %{name}-default-jre = %{version}-%{release}
+Requires: %{name}-jdk = %{version}-%{release}
Provides: j2sdk = %{_jdkversion}
Provides: jdk = %{_jdkversion}
Obsoletes: blackdown-java-sdk
@@ -168,39 +168,41 @@ Obsoletes: java-sun
Obsoletes: java5-sun
Obsoletes: jdk
Obsoletes: kaffe
+Obsoletes: openjdk9-jdk < 9.0.4.12-5
Obsoletes: oracle-java7
-%description jdk
+%description default-jdk
This package symlinks OpenJDK development tools provided by
-%{name}-jdk-base to system-wide directories like %{_bindir}, making
+%{name}-jdk to system-wide directories like %{_bindir}, making
OpenJDK the default JDK.
-%description jdk -l pl.UTF-8
+%description default-jdk -l pl.UTF-8
Ten pakiet tworzy symboliczne dowiązania do narzędzi programistycznych
-OpenJDK, dostarczanych przez pakiet %{name}-jdk-base, w standardowych
+OpenJDK, dostarczanych przez pakiet %{name}-jdk w standardowych
systemowych ścieżkach takich jak %{_bindir}, sprawiając tym samym, że
OpenJDK staje się domyślnym JDK w systemie.
-%package jdk-base
+%package jdk
Summary: OpenJDK - software development kit
Summary(pl.UTF-8): Kod OpenJDK - środowisko programistyczne
Group: Development/Languages/Java
-Requires: %{name}-jre-base = %{version}-%{release}
+Requires: %{name}-jre = %{version}-%{release}
Requires: jpackage-utils >= 0:1.7.5-8
-Recommends: %{name}-jdk = %{version}-%{release}
+Recommends: %{name}-default-jdk = %{version}-%{release}
Provides: jdk(%{name})
+Obsoletes: openjdk9-jdk-base < 9.0.4.12-5
-%description jdk-base
+%description jdk
OpenJDK development tools built using free software only.
-%description jdk-base -l pl.UTF-8
+%description jdk -l pl.UTF-8
OpenJDK skompilowane wyłącznie przy użyciu wolnego oprogramowania.
-%package jre
+%package default-jre
Summary: OpenJDK - runtime environment
Summary(pl.UTF-8): OpenJDK - środowisko uruchomieniowe
Group: Development/Languages/Java
-Requires: %{name}-jre-base = %{version}-%{release}
+Requires: %{name}-jre = %{version}-%{release}
Provides: java
Provides: java1.4
Provides: jre = %{_jdkversion}
@@ -220,39 +222,40 @@ Obsoletes: jmx
Obsoletes: jndi
Obsoletes: jre
Obsoletes: jsse
+Obsoletes: openjdk9-jre < 9.0.4.12-5
Obsoletes: oracle-java7-jre
-%description jre
+%description default-jre
This package symlinks OpenJDK runtime environment tools provided by
-%{name}-jre-base to system-wide directories like %{_bindir}, making
+%{name}-jre to system-wide directories like %{_bindir}, making
OpenJDK the default JRE.
-%description jre -l pl.UTF-8
+%description default-jre -l pl.UTF-8
Ten pakiet tworzy symboliczne dowiązania do środowiska
-uruchomieniowego OpenJDK, dostarczanych przez pakiet %{name}-jre-base,
+uruchomieniowego OpenJDK, dostarczanych przez pakiet %{name}-jre
w standardowych systemowych ścieżkach takich jak %{_bindir},
sprawiając tym samym, że OpenJDK staje się domyślnym JRE w systemie.
-%package jre-X11
+%package default-jre-X11
Summary: OpenJDK - runtime environment - X11 support
Summary(pl.UTF-8): OpenJDK - środowisko uruchomieniowe - obsługa X11
Group: Development/Languages/Java
-Requires: %{name}-jre = %{version}-%{release}
-Requires: %{name}-jre-base-X11 = %{version}-%{release}
+Requires: %{name}-jre-X11 = %{version}-%{release}
Obsoletes: icedtea6-jre-X11
Obsoletes: icedtea7-jre-X11
Obsoletes: java-sun-jre-X11
+Obsoletes: openjdk9-jre-X11 < 9.0.4.12-5
Obsoletes: oracle-java7-jre-X11
-%description jre-X11
+%description default-jre-X11
X11 support for OpenJDK runtime environment built using free software
only.
-%description jre-X11 -l pl.UTF-8
+%description default-jre-X11 -l pl.UTF-8
Biblioteki X11 dla środowiska OpenJDK zbudowany wyłocznie przy uzyciu
wolnego oprogramowania.
-%package jre-base
+%package jre
Summary: OpenJDK - runtime environment
Summary(pl.UTF-8): OpenJDK - środowisko uruchomieniowe
Group: Development/Languages/Java
@@ -260,7 +263,7 @@ Requires: jpackage-utils >= 0:1.7.5-8
Requires: nss >= 1:3.13.4
# Require zoneinfo data provided by java-tzdata subpackage.
Requires: java-tzdata
-Recommends: %{name}-jre = %{version}-%{release}
+Recommends: %{name}-default-jre = %{version}-%{release}
Provides: java(ClassDataVersion) = %{_classdataversion}
Provides: java(jaas) = %{version}
Provides: java(jaf) = 1.1.1
@@ -273,77 +276,82 @@ Provides: java(jmx) = 1.4
Provides: java(jndi) = %{version}
Provides: java(jsse) = %{version}
Provides: jre(%{name})
+Obsoletes: openjdk9-jre-base < 9.0.4.12-5
-%description jre-base
+%description jre
OpenJDK runtime environment built using free software only.
-%description jre-base -l pl.UTF-8
+%description jre -l pl.UTF-8
Środowisko uruchomieniowe OpenJDK zbudowany wyłącznie przy użyciu
wolnego oprogramowania.
-%package jre-base-X11
+%package jre-X11
Summary: OpenJDK - runtime environment - X11 support
Summary(pl.UTF-8): OpenJDK - środowisko uruchomieniowe - obsługa X11
Group: Development/Languages/Java
-Requires: %{name}-jre-base = %{version}-%{release}
-Requires: %{name}-jre-base-freetype = %{version}-%{release}
-Recommends: %{name}-jre-X11 = %{version}-%{release}
+Requires: %{name}-jre = %{version}-%{release}
+Requires: %{name}-jre-freetype = %{version}-%{release}
+Recommends: %{name}-default-jre-X11 = %{version}-%{release}
Provides: jre-X11 = %{version}
Provides: jre-X11(%{name})
+Obsoletes: openjdk9-jre-base-X11 < 9.0.4.12-5
-%description jre-base-X11
+%description jre-X11
X11 support for OpenJDK runtime environment built using free software
only.
-%description jre-base-X11 -l pl.UTF-8
+%description jre-X11 -l pl.UTF-8
Biblioteki X11 dla środowiska OpenJDK zbudowany wyłocznie przy uzyciu
wolnego oprogramowania.
-%package jre-base-alsa
+%package jre-alsa
Summary: OpenJDK - runtime environment - ALSA support
Summary(pl.UTF-8): OpenJDK - środowisko uruchomieniowe - obsługa ALSA
Group: Development/Languages/Java
-Requires: %{name}-jre-base = %{version}-%{release}
+Requires: %{name}-jre = %{version}-%{release}
+Obsoletes: openjdk9-jre-base-alsa < 9.0.4.12-5
-%description jre-base-alsa
+%description jre-alsa
ALSA sound support for OpenJDK runtime environment build using free
software only.
-%description jre-base-alsa -l pl.UTF-8
+%description jre-alsa -l pl.UTF-8
Biblioteki ALSA rozszerzające środowisko OpenJDK o obsługę dźwięku
zbudowane przy uzyciu wyłącznie wolnego oprogramowania.
-%package jre-base-freetype
+%package jre-freetype
Summary: OpenJDK - runtime environment - font support
Summary(pl.UTF-8): OpenJDK - środowisko uruchomieniowe - obsługa fontów
Group: Development/Languages/Java
-Requires: %{name}-jre-base = %{version}-%{release}
+Requires: %{name}-jre = %{version}-%{release}
+Obsoletes: openjdk9-jre-base-freetype < 9.0.4.12-5
-%description jre-base-freetype
+%description jre-freetype
Font handling library for OpenJDK runtime environment built using free
software only.
-%description jre-base-freetype -l pl.UTF-8
+%description jre-freetype -l pl.UTF-8
Biblioteki obsługi czcionek dla OpenJDK zbudowane wyłącznie przy
użyciu wolnego oprogramowania.
-%package jar
+%package default-jar
Summary: OpenJDK - JAR tool
Summary(pl.UTF-8): OpenJDK - narzędzie JAR
Group: Development/Languages/Java
-Requires: %{name}-jdk-base = %{version}-%{release}
+Requires: %{name}-jdk = %{version}-%{release}
Provides: jar
Obsoletes: fastjar
Obsoletes: icedtea6-jar
Obsoletes: icedtea7-jar
Obsoletes: jar
+Obsoletes: openjdk9-jar < 9.0.4.12-5
-%description jar
+%description default-jar
JAR tool from OpenJDK built using free software only.
JAR is an archiver used to merge Java classes into a single library.
-%description jar -l pl.UTF-8
+%description default-jar -l pl.UTF-8
Narzędzie jar z OpenJDK zbudowane przy uzyciu wyłącznie wolnego
oprogramowania.
@@ -351,21 +359,22 @@ JAR jest narzędziem pozwalającym wykonywać podstawowe operacje na
archiwach javy .jar takie jak na przykład tworzenie lub rozpakowywanie
archiwów.
-%package appletviewer
+%package default-appletviewer
Summary: OpenJDK - appletviewer tool
Summary(pl.UTF-8): OpenJDK - narzędzie appletviewer
Group: Development/Languages/Java
-Requires: %{name}-jdk-base = %{version}-%{release}
+Requires: %{name}-jdk = %{version}-%{release}
Requires: %{name}-jre-X11 = %{version}-%{release}
Obsoletes: icedtea6-appletviewer
Obsoletes: icedtea7-appletviewer
Obsoletes: java-sun-appletviewer
+Obsoletes: openjdk9-appletviewer < 9.0.4.12-5
Obsoletes: oracle-java7-appletviewer
-%description appletviewer
+%description default-appletviewer
Appletviewer from OpenJDK build using free software only.
-%description appletviewer -l pl.UTF-8
+%description default-appletviewer -l pl.UTF-8
Appletviewer pozwala uruchamiać aplety javy niezależnie od
przeglądarki www. Ten appletviewer pochodzi z zestawu narzędzi OpenJDK
i został zbudowany wyłącznie przy użyciu wolnego oprogramowania.
@@ -525,7 +534,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%files jdk
+%files default-jdk
%defattr(644,root,root,755)
%{?with_aot:%attr(755,root,root) %{_bindir}/jaotc}
%attr(755,root,root) %{_bindir}/jarsigner
@@ -599,7 +608,7 @@ rm -rf $RPM_BUILD_ROOT
%lang(ja) %{_mandir}/ja/man1/wsimport.1*
%lang(ja) %{_mandir}/ja/man1/xjc.1*
-%files jdk-base
+%files jdk
%defattr(644,root,root,755)
%dir %{dstdir}
%{_jvmdir}/%{name}
@@ -638,7 +647,7 @@ rm -rf $RPM_BUILD_ROOT
%{?with_aot:%attr(755,root,root) %{dstdir}/lib/libjelfshim.so}
%{dstdir}/lib/ct.sym
-%files jre
+%files default-jre
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/idlj
%attr(755,root,root) %{_bindir}/java
@@ -677,7 +686,7 @@ rm -rf $RPM_BUILD_ROOT
%lang(ja) %{_mandir}/ja/man1/tnameserv.1*
%lang(ja) %{_mandir}/ja/man1/unpack200.1*
-%files jre-base
+%files jre
%defattr(644,root,root,755)
%dir %{_sysconfdir}/%{name}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*
@@ -747,34 +756,34 @@ rm -rf $RPM_BUILD_ROOT
%{dstdir}/lib/tzdb.dat
%{jvmjardir}
-%files jre-X11
+%files default-jre-X11
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/policytool
%{_mandir}/man1/policytool.1*
%lang(ja) %{_mandir}/ja/man1/policytool.1*
-%files jre-base-X11
+%files jre-X11
%defattr(644,root,root,755)
%attr(755,root,root) %{dstdir}/bin/policytool
%attr(755,root,root) %{dstdir}/lib/libsplashscreen.so
%attr(755,root,root) %{dstdir}/lib/libawt_xawt.so
%attr(755,root,root) %{dstdir}/lib/libjawt.so
-%files jre-base-alsa
+%files jre-alsa
%defattr(644,root,root,755)
%attr(755,root,root) %{dstdir}/lib/libjsoundalsa.so
-%files jre-base-freetype
+%files jre-freetype
%defattr(644,root,root,755)
%attr(755,root,root) %{dstdir}/lib/libfontmanager.so
-%files jar
+%files default-jar
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/jar
%{_mandir}/man1/jar.1*
%lang(ja) %{_mandir}/ja/man1/jar.1*
-%files appletviewer
+%files default-appletviewer
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/appletviewer
%{_mandir}/man1/appletviewer.1*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openjdk9.git/commitdiff/a0d49465f2ea61d7046dfc72bdb69d7ff3eb0351
More information about the pld-cvs-commit
mailing list