Hello community,

here is the log from the commit of package FirmwareUpdateKit for 
openSUSE:Factory checked in at 2018-03-11 15:25:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/FirmwareUpdateKit (Old)
 and      /work/SRC/openSUSE:Factory/.FirmwareUpdateKit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "FirmwareUpdateKit"

Sun Mar 11 15:25:04 2018 rev:19 rq:585001 version:1.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/FirmwareUpdateKit/FirmwareUpdateKit.changes      
2012-06-25 11:45:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.FirmwareUpdateKit.new/FirmwareUpdateKit.changes 
2018-03-11 15:25:05.731550558 +0100
@@ -1,0 +2,9 @@
+Mon Mar  5 13:30:04 UTC 2018 - adam.ma...@suse.de
+
+- support_mkisofs.patch: support mkisofs in addition to genisoimage
+  (bnc#1081739)
+- user_executable.patch: specify path for executables in /usr/sbin
+  allowing us to create images as a regular user.
+- spec file cleanup and use v3 SPDX license
+
+-------------------------------------------------------------------

New:
----
  support_mkisofs.patch
  user_executable.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ FirmwareUpdateKit.spec ++++++
--- /var/tmp/diff_new_pack.SSsJD8/_old  2018-03-11 15:25:06.959506505 +0100
+++ /var/tmp/diff_new_pack.SSsJD8/_new  2018-03-11 15:25:06.963506362 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package FirmwareUpdateKit
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2008 Steffen Winterfeldt
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,34 +18,43 @@
 
 
 Name:           FirmwareUpdateKit
-Requires:       syslinux genisoimage dosfstools mtools
-Summary:        Assist with DOS-based firmware updates
-License:        GPL-3.0+
-Group:          System/Boot
 Version:        1.6
 Release:        0
+Summary:        Assist with DOS-based firmware updates
+License:        GPL-3.0-or-later
+Group:          System/Boot
+Source:         FirmwareUpdateKit-1.6.tar.bz2
+Patch1:         support_mkisofs.patch
+Patch2:         user_executable.patch
+Requires:       dosfstools
+%if 0%{suse_version} >= 1500
+Requires:       mkisofs
+%else
+Requires:       genisoimage
+%endif
+Requires:       mtools
+Requires:       syslinux
 Obsoletes:      dosbootdisk
 Provides:       dosbootdisk
-Source:         FirmwareUpdateKit-1.6.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch:  %ix86 x86_64
+ExclusiveArch:  %{ix86} x86_64
 
 %description
 Create a bootable mini-DOS system and add files to it. Useful if you
 have to do firmware updates from DOS.
 
 %prep
-%setup
+%setup -q
+%patch1 -p1
+%patch2 -p1
 
 %build
 
 %install
-  make install DESTDIR=%{buildroot}
+%make_install
 
 %files
-%defattr(-,root,root)
-/usr/bin/fuk
-/usr/share/FirmwareUpdateKit
-%doc doc/*
+%{_bindir}/fuk
+%{_datadir}/FirmwareUpdateKit
+%license doc/COPYING
 
 %changelog

++++++ support_mkisofs.patch ++++++
Index: FirmwareUpdateKit-1.6/fuk
===================================================================
--- FirmwareUpdateKit-1.6.orig/fuk
+++ FirmwareUpdateKit-1.6/fuk
@@ -499,8 +499,12 @@ if($opt_iso) {
   if(!-f "/usr/share/syslinux/isolinux.bin") {
     die "/usr/share/syslinux/isolinux.bin: no such file\nPlease install 
package 'syslinux'.\n";
   }
-  if(!-x "/usr/bin/genisoimage") {
-    die "genisoimage not found\nPlease install package 'genisoimage'.\n";
+  $mkisofs = "/usr/bin/mkisofs";
+  if(!-x $mkisofs) {
+    $mkisofs = "/usr/bin/genisoimage";
+    if(!-x $mkisofs) {
+      die "mkisofs not found\nPlease install package 'mkisofs' or 
'genisoimage'.\n";
+    }
   }
 
   mkdir "$fuk_dir/cd", 0755;
@@ -523,7 +527,7 @@ timeout             0
 
   system "cp /usr/share/syslinux/memdisk $fuk_dir/cd";
   system "cp /usr/share/syslinux/isolinux.bin $fuk_dir/cd";
-  system "genisoimage" . ($opt_verbose ? "" : " --quiet") .
+  system $mkisofs . ($opt_verbose ? "" : " --quiet") .
     " -o $opt_iso -f -no-emul-boot -boot-load-size 4 -boot-info-table -b 
isolinux.bin -hide boot.catalog $fuk_dir/cd";
 
   exit 0;
++++++ user_executable.patch ++++++
Index: FirmwareUpdateKit-1.6/fuk
===================================================================
--- FirmwareUpdateKit-1.6.orig/fuk
+++ FirmwareUpdateKit-1.6/fuk
@@ -308,7 +308,7 @@
         close W1;
         if($self->{fs} eq 'fat') {
           my $x = " -n '$self->{label}'" if $self->{label} ne "";
-          system "mkfs.vfat -h $pt_size$x $f >/dev/null";
+          system "/usr/sbin/mkfs.vfat -h $pt_size$x $f >/dev/null";
 
           my ($fat, $boot);
 
@@ -343,16 +343,16 @@
         }
         elsif($self->{fs} eq 'ext2' || $self->{fs} eq 'ext3') {
           my $x = " -L '$self->{label}'" if $self->{label} ne "";
-          system "mkfs.$self->{fs} -q -m 0 -F$x $f";
-          system "tune2fs -c 0 -i 0 $f >/dev/null 2>&1";
+          system "/usr/sbin/mkfs.$self->{fs} -q -m 0 -F$x $f";
+          system "/usr/sbin/tune2fs -c 0 -i 0 $f >/dev/null 2>&1";
         }
         elsif($self->{fs} eq 'reiserfs') {
           my $x = " -l '$self->{label}'" if $self->{label} ne "";
-          system "mkfs.reiserfs -q -ff$x $f";
+          system "/usr/sbin/mkfs.reiserfs -q -ff$x $f";
         }
         elsif($self->{fs} eq 'xfs') {
           my $x = " -L '$self->{label}'" if $self->{label} ne "";
-          system "mkfs.xfs -q$x $f";
+          system "/usr/sbin/mkfs.xfs -q$x $f";
         }
         else {
           print STDERR "warning: $self->{fs}: unsupported file system\n";

Reply via email to