From d70e7bcbd0f08f30aa99e8b7d63098bb5c1a721458794d3551bbd35c9793a84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 23 Mar 2019 11:41:20 +0000 Subject: [PATCH] Accepting request 687879 from home:jengelh:branches:Java:packages - Make scriptlets POSIX sh compatible. - Trim filler wording from descriptions. OBS-URL: https://build.opensuse.org/request/show/687879 OBS-URL: https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=7 --- scala.changes | 6 ++++++ scala.spec | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/scala.changes b/scala.changes index d506865..984ea22 100644 --- a/scala.changes +++ b/scala.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 23 08:27:59 UTC 2019 - Jan Engelhardt + +- Make scriptlets POSIX sh compatible. +- Trim filler wording from descriptions. + ------------------------------------------------------------------- Fri Mar 1 06:35:22 UTC 2019 - Fridrich Strba diff --git a/scala.spec b/scala.spec index 10b39e3..3408233 100644 --- a/scala.spec +++ b/scala.spec @@ -99,10 +99,10 @@ Obsoletes: %{base_name}-bootstrap %endif %description -Scala is a general purpose programming language designed to express common -programming patterns in a concise, elegant, and type-safe way. It smoothly -integrates features of object-oriented and functional languages. It is also -fully interoperable with Java. +Scala is a general purpose programming language designed to express +common programming patterns in a concise and type-safe way. It +integrates features of object-oriented and functional languages. It +is also interoperable with Java. %package apidoc Summary: Documentation for the Scala programming language @@ -114,16 +114,16 @@ object-oriented and functional programming. This package provides reference and API documentation for the Scala programming language. %package swing -Summary: The swing library for the scala programming languages +Summary: The swing library for the Scala programming languages Group: Development/Libraries/Java Requires: java >= 1.7 Requires: scala = %{version}-%{release} %description swing -This package contains the swing library for the scala programming languages. -This library is required to develop GUI-related applications in scala. +This package contains the swing library for the Scala programming languages. +This library is required to develop GUI-related applications in Scala. The release provided by this package is not the original version from upstream -because this version is not compatible with JDK-1.7. +because this version is not compatible with JDK 1.7. %package -n ant-%{name} Summary: Development files for Scala @@ -134,7 +134,7 @@ Requires: scala = %{version}-%{release} %description -n ant-%{name} Scala is a general purpose programming language for the JVM that blends object-oriented and functional programming. This package enables support for -the scala ant tasks. +the Scala ant tasks. %prep @@ -274,15 +274,15 @@ install -d %{buildroot}%{_mandir}/man1 install -p -m 644 build/scaladoc/manual/man/man1/* %{buildroot}%{_mandir}/man1 %post -touch --no-create %{_datadir}/mime/packages &> /dev/null || : +touch --no-create %{_datadir}/mime/packages >/dev/null 2>&1 || : %postun if [ $1 -eq 0 ]; then -update-mime-database %{_datadir}/mime &> /dev/null || : +update-mime-database %{_datadir}/mime >/dev/null 2>&1 || : fi %posttrans -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +update-mime-database %{?fedora:-n} %{_datadir}/mime >/dev/null 2>&1 || : %files -f .mfiles %{_bindir}/*