From 180faf7d084ce40c14e8e9587af9d45aaf8b5f6734171de8999ee7cbbf34f3c6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 29 Aug 2018 09:04:32 +0000 Subject: [PATCH] - Remove schily-2018-05-25_star_mk.patch (no longer needed) OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=37 --- schily-2018-05-25_star_mk.patch | 21 --------------------- schily.changes | 1 + schily.spec | 3 +-- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 schily-2018-05-25_star_mk.patch diff --git a/schily-2018-05-25_star_mk.patch b/schily-2018-05-25_star_mk.patch deleted file mode 100644 index 0b4ae61..0000000 --- a/schily-2018-05-25_star_mk.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Kristyna Streitova -Date: Wed, 06 Jun 2018 14:51:57 +0000 -X-Upstream: PATCH-FIX-UPSTREAM - -Fix broken star.mk in 1.5.3 (included from all.mk) - -Index: schily-2018-05-25/star/star.mk -=================================================================== ---- schily-2018-05-25.orig/star/star.mk -+++ schily-2018-05-25/star/star.mk -@@ -37,8 +37,8 @@ CFILES= star.c header.c cpiohdr.c xhead - findinfo.c pathname.c - HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \ - movearch.h table.h props.h fifo.h diff.h restore.h \ -- checkerr.h dumpdate.h bitstring.h --LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX) -+ checkerr.h dumpdate.h bitstring.h pathname.h -+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX) $(LIB_CAP) - XMK_FILE= Makefile.man - - ########################################################################### diff --git a/schily.changes b/schily.changes index d5668ed..84adec1 100644 --- a/schily.changes +++ b/schily.changes @@ -26,6 +26,7 @@ Wed Aug 29 07:57:23 UTC 2018 - jengelh@inai.de schily-2018-05-25_star_no_fsync.patch, schily-2018-05-25_star_selinux.patch (merged upstream) +- Remove schily-2018-05-25_star_mk.patch (no longer needed) ------------------------------------------------------------------- Wed Aug 29 07:45:44 UTC 2018 - jengelh@inai.de diff --git a/schily.spec b/schily.spec index 1c034d7..103119a 100644 --- a/schily.spec +++ b/schily.spec @@ -37,7 +37,6 @@ Source1: README-FIRST Patch1: iconv-name.diff Patch2: schily-2018-05-25_star_configuration.patch Patch4: schily-2018-05-25_star_lock.patch -Patch8: schily-2018-05-25_star_mk.patch # Honor https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Upstream_policy # and submit patches upstream FIRST (cc to the bspkg maintainer perhaps). BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -406,7 +405,7 @@ Features: %prep %setup -qn %name-%rver -%patch -P 1 -P 2 -P 4 -P 8 -p1 +%patch -P 1 -P 2 -P 4 -p1 find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+" cp %{SOURCE1} .