From 440b919d145b9fdf10a074f4b33a4d3893ac47fe9ce32616caed672a0b01e6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 8 Feb 2017 14:06:23 +0000 Subject: [PATCH] Accepting request 455490 from home:dimstar:Factory ESD is long deprecated and even former upstream maintainers suggest to get rid of it OBS-URL: https://build.opensuse.org/request/show/455490 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xlockmore?expand=0&rev=32 --- xlockmore-no-copy-dt-needed-entries.patch | 14 -------------- xlockmore.changes | 8 ++++++++ xlockmore.spec | 6 +----- 3 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 xlockmore-no-copy-dt-needed-entries.patch diff --git a/xlockmore-no-copy-dt-needed-entries.patch b/xlockmore-no-copy-dt-needed-entries.patch deleted file mode 100644 index 0c26a41..0000000 --- a/xlockmore-no-copy-dt-needed-entries.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: xlockmore-5.34/configure.in -=================================================================== ---- xlockmore-5.34.orig/configure.in -+++ xlockmore-5.34/configure.in -@@ -367,6 +367,9 @@ main () - rm -f conf.gtktest - ]) - -+dnl audio file for --no-copy-dt-needed-entries -+XLOCKLIBS="-laudiofile" -+ - dnl X Window System files. - AC_PATH_XTRA - if test "$no_x" = yes; then diff --git a/xlockmore.changes b/xlockmore.changes index 23ada9e..d197eba 100644 --- a/xlockmore.changes +++ b/xlockmore.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 8 12:25:25 UTC 2017 - dimstar@opensuse.org + +- Drop esound-devel BuildRequires: the distro moved away from + esound some years ago. +- Drop xlockmore-no-copy-dt-needed-entries.patch: as esd is no + longer being built, we also don't need to link it anymore. + ------------------------------------------------------------------- Tue Mar 10 17:12:23 UTC 2015 - vcizek@suse.com diff --git a/xlockmore.spec b/xlockmore.spec index b440b66..a2f1d07 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ # # spec file for package xlockmore # -# Copyright (c) 2016 SUSE LINUX 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 @@ -35,8 +35,6 @@ Patch1: %{name}-bitmaps.patch Patch3: xlockmore-ttf_dir.patch # end of X.org related patches Patch7: xlockmore-strict-aliasing.patch -# feel free to improve it and please upstream it -Patch8: xlockmore-no-copy-dt-needed-entries.patch # PATCH-FIX-UPSTREAM xlockmore-extend-freetype-include-search.patch -- search only for freetype.h, not the half path. Also, # extended list of directories where could freetype be found Patch9: xlockmore-extend-freetype-include-search.patch @@ -44,7 +42,6 @@ Patch10: xlockmore-nose_mode_crash.patch BuildRequires: ImageMagick-devel BuildRequires: automake BuildRequires: bc -BuildRequires: esound-devel BuildRequires: fdupes BuildRequires: freeglut-devel BuildRequires: freetype2-devel @@ -84,7 +81,6 @@ chmod -x README docs/Revisions %patch1 %patch3 %patch7 -%patch8 -p1 %patch9 -p1 %patch10 -p1