From 0d594828d3fc9bfc69feb65e5c5b27c7ae2ba5d6 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 8 Dec 2018 21:05:28 +0100 Subject: [PATCH] - Upgrade to 1.5.0 - Provide KDE service menu entry for KDE 4 and 5 (#1633872) --- .gitignore | 1 + libisoburn.spec | 58 ++++++++----------- sources | 5 +- ...sktop => xorriso_extract_iso_image.desktop | 9 +-- 4 files changed, 32 insertions(+), 41 deletions(-) rename xorriso_servicemenu.desktop => xorriso_extract_iso_image.desktop (53%) diff --git a/.gitignore b/.gitignore index 0625ceb..5439437 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +/gpgkey-*.gpg /libisoburn-*.tar.gz /libisoburn-*.tar.gz.sig diff --git a/libisoburn.spec b/libisoburn.spec index 218dac5..0ec892a 100644 --- a/libisoburn.spec +++ b/libisoburn.spec @@ -1,16 +1,17 @@ Summary: Library to enable creation and expansion of ISO-9660 filesystems Name: libisoburn -Version: 1.4.8 -Release: 3%{?dist} +Version: 1.5.0 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://libburnia-project.org/ Source0: http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz Source1: http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz.sig -Source2: xorriso_servicemenu.desktop +Source2: gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg +Source3: xorriso_extract_iso_image.desktop Patch0: libisoburn-1.0.8-multilib.patch -BuildRequires: gcc, gcc-c++ -BuildRequires: readline-devel, libacl-devel, zlib-devel +BuildRequires: gnupg2 +BuildRequires: gcc, gcc-c++, readline-devel, libacl-devel, zlib-devel %if 0%{?rhel} >= 6 BuildRequires: libburn1-devel >= %{version}, libisofs1-devel >= %{version} BuildRequires: autoconf, automake, libtool @@ -40,9 +41,7 @@ developing applications that use libisoburn. %package doc Summary: Documentation files for libisoburn Group: Documentation -%if 0%{?fedora} || 0%{?rhel} >= 6 BuildArch: noarch -%endif BuildRequires: doxygen, graphviz %description doc @@ -56,13 +55,12 @@ Summary: ISO-9660 and Rock Ridge image manipulation tool Group: Applications/Archiving URL: http://scdbackup.sourceforge.net/xorriso_eng.html Requires: %{name}%{?_isa} = %{version}-%{release} -%if 0%{?rhel} >= 6 || 0%{?fedora} Requires: kde-filesystem >= 4 -Requires(post): %{_sbindir}/alternatives, coreutils -Requires(preun): %{_sbindir}/alternatives +%if 0%{?rhel} >= 7 || 0%{?fedora} +Requires: kf5-filesystem >= 5 %endif -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +Requires(post): /sbin/install-info, %{_sbindir}/alternatives, coreutils +Requires(preun): /sbin/install-info, %{_sbindir}/alternatives %description -n xorriso Xorriso is a program which copies file objects from POSIX compliant @@ -79,6 +77,7 @@ supported media: CD-R, CD-RW, DVD-R, DVD-RW, DVD+R, DVD+R DL, DVD+RW, DVD-RAM, BD-R and BD-RE. %prep +gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %setup -q %patch0 -p1 -b .multilib @@ -92,12 +91,11 @@ touch NEWS; autoreconf --force --install %build %configure --disable-static -make %{?_smp_mflags} +%make_build doxygen doc/doxygen.conf %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install +%make_install # Don't install any libtool .la files rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la @@ -106,37 +104,32 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la rm -rf $RPM_BUILD_ROOT%{_defaultdocdir} # Install the KDE service menu handler -%if 0%{?rhel} >= 6 || 0%{?fedora} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde4/services/ServiceMenus/ -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/kde4/services/ServiceMenus/ +install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/kde4/services/ServiceMenus/xorriso_extract_iso_image.desktop +%if 0%{?rhel} >= 7 || 0%{?fedora} +install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/kservices5/ServiceMenus/xorriso_extract_iso_image.desktop %endif # Symlink xorriso as mkisofs (like in cdrkit) -%if 0%{?rhel} >= 6 || 0%{?fedora} ln -sf xorriso $RPM_BUILD_ROOT%{_bindir}/mkisofs -%endif # Some file cleanups rm -f $RPM_BUILD_ROOT%{_infodir}/dir # Don't ship proof of concept for the moment -rm -f $RPM_BUILD_ROOT%{_bindir}/xorriso-tcltk +rm -f $RPM_BUILD_ROOT{%{_bindir},%{_infodir},%{_mandir}/man1}/xorriso-tcltk* %check export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$RPM_BUILD_ROOT%{_libdir}" cd releng ./run_all_auto -x ../xorriso/xorriso || (cat releng_generated_data/log.*; exit 1) -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %post -n xorriso /sbin/install-info %{_infodir}/xorrecord.info.gz %{_infodir}/dir || : /sbin/install-info %{_infodir}/xorriso.info.gz %{_infodir}/dir || : /sbin/install-info %{_infodir}/xorrisofs.info.gz %{_infodir}/dir || : -%if 0%{?rhel} >= 6 || 0%{?fedora} link=`readlink %{_bindir}/mkisofs` if [ "$link" == "xorriso" ]; then rm -f %{_bindir}/mkisofs @@ -144,7 +137,6 @@ fi %{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs %{_bindir}/xorriso 50 \ --slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman %{_mandir}/man1/xorrisofs.1.gz -%endif %preun -n xorriso if [ $1 = 0 ]; then @@ -152,13 +144,10 @@ if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/xorriso.info.gz %{_infodir}/dir || : /sbin/install-info --delete %{_infodir}/xorrisofs.info.gz %{_infodir}/dir || : -%if 0%{?rhel} >= 6 || 0%{?fedora} %{_sbindir}/alternatives --remove mkisofs %{_bindir}/xorriso -%endif fi %files -%{!?_licensedir:%global license %%doc} %license COPYING %doc AUTHORS COPYRIGHT README ChangeLog %{_libdir}/%{name}*.so.* @@ -173,9 +162,7 @@ fi %doc doc/html/ %files -n xorriso -%if 0%{?rhel} >= 6 || 0%{?fedora} %ghost %{_bindir}/mkisofs -%endif %{_bindir}/osirrox %{_bindir}/xorrecord %{_bindir}/xorriso @@ -186,11 +173,16 @@ fi %{_infodir}/xorrecord.info* %{_infodir}/xorriso.info* %{_infodir}/xorrisofs.info* -%if 0%{?rhel} >= 6 || 0%{?fedora} -%{_datadir}/kde4/services/ServiceMenus/xorriso_servicemenu.desktop +%{_datadir}/kde4/services/ServiceMenus/xorriso_extract_iso_image.desktop +%if 0%{?rhel} >= 7 || 0%{?fedora} +%{_datadir}/kservices5/ServiceMenus/xorriso_extract_iso_image.desktop %endif %changelog +* Sat Dec 08 2018 Robert Scheck 1.5.0-1 +- Upgrade to 1.5.0 +- Provide KDE service menu entry for KDE 4 and 5 (#1633872) + * Fri Jul 13 2018 Fedora Release Engineering - 1.4.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index c692102..d5de256 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (libisoburn-1.4.8.tar.gz) = 26dd6f6884d98d9d3f54bf18b529a688d28aa0ff54b7fe6fe7926c7765755a1c7f7b2d0ef02ca6ea2bdac9ddf6f928c01c89a3547aea1e9f0b47346b160d0d46 -SHA512 (libisoburn-1.4.8.tar.gz.sig) = 115f2aab04b10bfe25d776c4599b8a08e39aa2ffcb72efac5a4c0c80dc7d530a8fd970b4ce68854a968bd89d48f634db4e429739f4632c5fd599ea9a707c0603 +SHA512 (gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg) = d287374e95680ca4be38d7dc09c71e9f2e466eb62abc6fc29da6d5d984e0bceab9a2d0eca85ccb3a6f2cd7cbaa6c8d02c817aa84864d159616b0b2ca8e96b9db +SHA512 (libisoburn-1.5.0.tar.gz) = c74a9e2887244c28c82abe70d2603dbcd49b639c370e5b7fea03aabce59ff2b361345cd6ec88fe8152727e8a416d4759b88d91e2b5aec8a697408e00b7dc9e4d +SHA512 (libisoburn-1.5.0.tar.gz.sig) = c5ddade61cd1b2c4591669c7b7028b6bf9238ce2df67e8808f798c9187473e4114bbdbc2461a461ac674876006e6d2b30401b8aaf33c99adaa5eba13c46d5501 diff --git a/xorriso_servicemenu.desktop b/xorriso_extract_iso_image.desktop similarity index 53% rename from xorriso_servicemenu.desktop rename to xorriso_extract_iso_image.desktop index 5a4df14..6c0b115 100644 --- a/xorriso_servicemenu.desktop +++ b/xorriso_extract_iso_image.desktop @@ -1,14 +1,11 @@ [Desktop Entry] Type=Service -ServiceTypes=KonqPopupMenu/Plugin +X-KDE-ServiceTypes=KonqPopupMenu/Plugin MimeType=application/x-cd-image; Actions=xorrisoExtractHere; -X-KDE-Priority=TopLevel -X-KDE-StartupNotify=false [Desktop Action xorrisoExtractHere] -Name=Xorriso: extract ISO-image here -Name[de]=Xorriso: ISO-Abbild hier entpacken -Name[fi]=Xorriso: Pura ISO tiedosto tähän +Name=Extract ISO image using Xorriso here +Name[de]=ISO-Abbild mit Xorriso hier entpacken Icon=media-optical Exec=/bin/nice -n 19 ionice -n7 -c3 xorriso -indev "%F" -osirrox on -cp_rx "*" "$(dirname %F)"