Accepting request 828864 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/828864
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-binfmt-misc?expand=0&rev=18

java-binfmt-misc.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Wed Aug 19 09:19:01 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
+
+- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)
+- Spec file cleanups
+
+-------------------------------------------------------------------
+Thu Sep  7 07:44:19 UTC 2017 - mpluskal@suse.com
+
+- Reload systemd-binfmt.service so that binfmt setting are applied
+  without need to reboot (bsc#1057531)
+
+-------------------------------------------------------------------
+Sun Mar 26 13:05:19 UTC 2017 - tchvatal@suse.com
+
+- Run desktop db scriptlet updates wrt bsc#1030903
+
+-------------------------------------------------------------------
+Tue Mar 21 09:22:41 UTC 2017 - tchvatal@suse.com
+
+- Move the wrappers to libexec wrt bsc#1029650 (see binfmt.d(5))
+- Format a bit with spec-cleaner
+
 -------------------------------------------------------------------
 Mon Jul 29 13:28:09 UTC 2013 - mvyskocil@suse.com
 

java-binfmt-misc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package java-binfmt-misc
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,6 @@
 #
 
 
-%define runtimescript java-binfmt-misc
-
 Name:           java-binfmt-misc
 Version:        1.4
 Release:        0
@@ -27,13 +25,15 @@ Group:          Development/Languages/Java
 Url:            http://www.kernel.org/
 # derived from Linux's Documentation/java.txt
 Source0:        %{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  update-desktop-files
+Requires(post): desktop-file-utils
+Requires(post): shared-mime-info
+Requires(post): systemd
+Requires(postun): desktop-file-utils
+Requires(postun): shared-mime-info
+Requires(postun): systemd
 # split-alias for libzypp
-# http://en.opensuse.org/Upgrade_Dependencies#Splitting_a_package_into_two
-Provides:       jpackage-utils:/usr/bin/jarwrapper
-# Conflicts with an unsplitted version of jpackage-utils
-Conflicts:      jpackage-utils <= 1.7.5-2.3
+Provides:       jpackage-utils:%{_bindir}/jarwrapper
 
 %description
 Linux beats them ALL! While all other OS's are TALKING about direct
@@ -46,42 +46,50 @@ program after you have installed this package.
 %setup -q
 
 %build
-gcc $RPM_OPT_FLAGS javaclassname.c -o javaclassname
+gcc %{optflags} javaclassname.c -o javaclassname
 
 %install
 # a basic directory structure
-install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/{applications,pixmaps,lib/binfmt.d}
-install -d -m 0755 $RPM_BUILD_ROOT/%{_bindir}/
-install -d -m 0755 $RPM_BUILD_ROOT/%{_mandir}/man1
+install -d -m 0755 %{buildroot}%{_datadir}/{applications,pixmaps}
+install -d -m 0755 %{buildroot}%{_binfmtdir}
+install -d -m 0755 %{buildroot}%{_bindir}/
+install -d -m 0755 %{buildroot}%{_mandir}/man1
 # wrappers
-install -m 0755 javaclassname $RPM_BUILD_ROOT/%{_bindir}/
-install -m 0755 *wrapper $RPM_BUILD_ROOT/%{_bindir}/
+install -m 0755 javaclassname %{buildroot}%{_bindir}/
+install -m 0755 *wrapper %{buildroot}%{_bindir}/
 # desktop menu
-install -m 0644 share/java.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/java.png
-install -m 0644 share/*desktop $RPM_BUILD_ROOT%{_datadir}/applications/
+install -m 0644 share/java.png %{buildroot}%{_datadir}/pixmaps/java.png
+install -m 0644 share/*desktop %{buildroot}%{_datadir}/applications/
 for wrapper in jarwrapper javawrapper javawswrapper; do
     # init binfmt.d snippet
-    install -m 0644 ${wrapper}.conf %{buildroot}%{_datadir}/lib/binfmt.d/
-    %suse_update_desktop_file -r $RPM_BUILD_ROOT%{_datadir}/applications/$wrapper.desktop Java System
+    install -m 0644 ${wrapper}.conf %{buildroot}%{_binfmtdir}/
+    %suse_update_desktop_file -r %{buildroot}%{_datadir}/applications/$wrapper.desktop Technology Java
 done
 # manual page
-gzip docs/%{name}.1
-mv docs/%{name}.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1
+mv docs/%{name}.1 %{buildroot}%{_mandir}/man1
 (
-cd $RPM_BUILD_ROOT/%{_mandir}/man1
+cd %{buildroot}%{_mandir}/man1
 for alias in jarwrapper javawrapper javawswrapper javaclassname; do
-    ln -sf %{name}.1.gz $alias.1.gz;
+    ln -sf %{name}.1 $alias.1
 done
 )
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post
+%desktop_database_post
+%mime_database_post
+%{_bindir}/systemctl restart systemd-binfmt.service ||:
+
+%postun
+%desktop_database_postun
+%mime_database_postun
+%{_bindir}/systemctl restart systemd-binfmt.service ||:
 
 %files
-%defattr(-,root,root,0755)
 %doc docs/
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/lib
+# Avoid dependency on systemd
+%dir %{_binfmtdir}
+%{_binfmtdir}/*.conf
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*