[packages/openjdk8] rename packages s/(jdk|jre)$/default-$1/ s/-base//
atler
atler at pld-linux.org
Tue Apr 28 18:10:45 CEST 2026
commit c6f113b3b2b7450db33332a3c2fbb46e9a9b2725
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Apr 28 18:07:06 2026 +0200
rename packages s/(jdk|jre)$/default-$1/ s/-base//
openjdk8.spec | 108 +++++++++++++++++++++++++++++++---------------------------
1 file changed, 58 insertions(+), 50 deletions(-)
---
diff --git a/openjdk8.spec b/openjdk8.spec
index 23bbb09..ed145c6 100644
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -162,13 +162,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}-default-jre = %{epoch}:%{version}-%{release}
Requires: %{name}-jar = %{epoch}:%{version}-%{release}
-Requires: %{name}-jdk-base = %{epoch}:%{version}-%{release}
-Requires: %{name}-jre = %{epoch}:%{version}-%{release}
+Requires: %{name}-jdk = %{epoch}:%{version}-%{release}
Provides: j2sdk = %{version}
Provides: jdk = %{version}
Obsoletes: blackdown-java-sdk
@@ -182,40 +182,42 @@ Obsoletes: java-sun
Obsoletes: java5-sun
Obsoletes: jdk
Obsoletes: kaffe
+Obsoletes: openjdk8-jdk < 1:1.8.0.492
Obsoletes: oracle-java7
Obsoletes: oracle-java8
-%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 = %{epoch}:%{version}-%{release}
+Requires: %{name}-jre = %{epoch}:%{version}-%{release}
Requires: jpackage-utils >= 0:1.7.5-8
-Recommends: %{name}-jdk = %{epoch}:%{version}-%{release}
+Recommends: %{name}-default-jdk = %{epoch}:%{version}-%{release}
Provides: jdk(%{name})
+Obsoletes: openjdk8-jdk-base < 1:1.8.0.492
-%description jdk-base
+%description jdk
OpenJDK development tools built using free software only.
-%description jdk-base -l pl.UTF-8
+%description jdk
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 = %{epoch}:%{version}-%{release}
+Requires: %{name}-jre = %{epoch}:%{version}-%{release}
Provides: java
Provides: java1.4
Provides: jre = %{version}
@@ -235,43 +237,45 @@ Obsoletes: jmx
Obsoletes: jndi
Obsoletes: jre
Obsoletes: jsse
+Obsoletes: openjdk8-jre < 1:1.8.0.492
Obsoletes: oracle-java7-jre
Obsoletes: oracle-java8-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 = %{epoch}:%{version}-%{release}
-Requires: %{name}-jre-base-X11 = %{epoch}:%{version}-%{release}
+Requires: %{name}-jre-X11 = %{epoch}:%{version}-%{release}
Provides: jre-X11 = %{version}
Obsoletes: icedtea6-jre-X11
Obsoletes: icedtea7-jre-X11
Obsoletes: icedtea8-jre-X11
Obsoletes: java-sun-jre-X11
+Obsoletes: openjdk8-jre-X11 < 1:1.8.0.492
Obsoletes: oracle-java7-jre-X11
Obsoletes: oracle-java8-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
@@ -279,7 +283,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 = %{epoch}:%{version}-%{release}
+Recommends: %{name}-default-jre = %{epoch}:%{version}-%{release}
Provides: java(ClassDataVersion) = %{_classdataversion}
Provides: java(jaas) = %{version}
Provides: java(jaf) = 1.1.1
@@ -292,58 +296,62 @@ Provides: java(jmx) = 1.4
Provides: java(jndi) = %{version}
Provides: java(jsse) = %{version}
Provides: jre(%{name})
+Obsoletes: openjdk8-jre-base < 1:1.8.0.492
Obsoletes: openjdk8-jre-base-gtk < 1:1.8.0.392-2
-%description jre-base
+%description jre
OpenJDK runtime environment built using free software only.
-%description jre-base -l pl.UTF-8
+%description jre
Ś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 = %{epoch}:%{version}-%{release}
-Requires: %{name}-jre-base-freetype = %{epoch}:%{version}-%{release}
-Recommends: %{name}-jre-X11 = %{epoch}:%{version}-%{release}
+Requires: %{name}-jre = %{epoch}:%{version}-%{release}
+Requires: %{name}-jre-freetype = %{epoch}:%{version}-%{release}
+Recommends: %{name}-default-jre-X11 = %{epoch}:%{version}-%{release}
Provides: jre-X11 = %{epoch}:%{version}-%{release}
Provides: jre-X11(%{name})
+Obsoletes: openjdk8-jre-base-X11 < 1:1.8.0.492
-%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 = %{epoch}:%{version}-%{release}
+Requires: %{name}-jre = %{epoch}:%{version}-%{release}
+Obsoletes: openjdk8-jre-base-alsa < 1:1.8.0.492
-%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 = %{epoch}:%{version}-%{release}
+Requires: %{name}-jre = %{epoch}:%{version}-%{release}
+Obsoletes: openjdk8-jre-base-freetype < 1:1.8.0.492
-%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.
@@ -351,7 +359,7 @@ użyciu wolnego oprogramowania.
Summary: OpenJDK - JAR tool
Summary(pl.UTF-8): OpenJDK - narzędzie JAR
Group: Development/Languages/Java
-Requires: %{name}-jdk-base = %{epoch}:%{version}-%{release}
+Requires: %{name}-jdk = %{epoch}:%{version}-%{release}
Provides: jar
Obsoletes: fastjar
Obsoletes: icedtea6-jar
@@ -376,7 +384,7 @@ archiwów.
Summary: OpenJDK - appletviewer tool
Summary(pl.UTF-8): OpenJDK - narzędzie appletviewer
Group: Development/Languages/Java
-Requires: %{name}-jdk-base = %{epoch}:%{version}-%{release}
+Requires: %{name}-jdk = %{epoch}:%{version}-%{release}
Requires: %{name}-jre-X11 = %{epoch}:%{version}-%{release}
Obsoletes: icedtea6-appletviewer
Obsoletes: icedtea7-appletviewer
@@ -578,7 +586,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc README.md
-%files jdk
+%files default-jdk
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/extcheck
%attr(755,root,root) %{_bindir}/idlj
@@ -666,7 +674,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)
%doc build/*-release/images/j2sdk-image/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
%dir %{dstdir}
@@ -719,7 +727,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{dstdir}/lib/%{jre_arch}/jli/*.so
%{?with_systemtap:%{dstdir}/tapset}
-%files jre
+%files default-jre
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/clhsdb
%attr(755,root,root) %{_bindir}/java
@@ -752,7 +760,7 @@ rm -rf $RPM_BUILD_ROOT
%lang(ja) %{_mandir}/ja/man1/unpack200.1*
%{_jvmdir}/java
-%files jre-base
+%files jre
%defattr(644,root,root,755)
%doc build/*-release/images/j2sdk-image/jre/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
%dir %{_sysconfdir}/%{name}
@@ -863,14 +871,14 @@ rm -rf $RPM_BUILD_ROOT
%{jredir}/lib/sound.properties
%{jvmjardir}
-%files jre-X11
+%files default-jre-X11
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/hsdb
%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/hsdb
%attr(755,root,root) %{jredir}/bin/policytool
@@ -880,11 +888,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjawt.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libsplashscreen.so
-%files jre-base-alsa
+%files jre-alsa
%defattr(644,root,root,755)
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjsoundalsa.so
-%files jre-base-freetype
+%files jre-freetype
%defattr(644,root,root,755)
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libfontmanager.so
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openjdk8.git/commitdiff/c6f113b3b2b7450db33332a3c2fbb46e9a9b2725
More information about the pld-cvs-commit
mailing list