Accepting request 455514 from X11:Utilities

1

OBS-URL: https://build.opensuse.org/request/show/455514
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xlockmore?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2017-02-09 10:18:51 +00:00 committed by Git OBS Bridge
commit e72b2e5575
3 changed files with 9 additions and 19 deletions

View File

@ -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

View File

@ -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 Tue Mar 10 17:12:23 UTC 2015 - vcizek@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package xlockmore # spec file for package xlockmore
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -35,8 +35,6 @@ Patch1: %{name}-bitmaps.patch
Patch3: xlockmore-ttf_dir.patch Patch3: xlockmore-ttf_dir.patch
# end of X.org related patches # end of X.org related patches
Patch7: xlockmore-strict-aliasing.patch 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, # 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 # extended list of directories where could freetype be found
Patch9: xlockmore-extend-freetype-include-search.patch Patch9: xlockmore-extend-freetype-include-search.patch
@ -44,7 +42,6 @@ Patch10: xlockmore-nose_mode_crash.patch
BuildRequires: ImageMagick-devel BuildRequires: ImageMagick-devel
BuildRequires: automake BuildRequires: automake
BuildRequires: bc BuildRequires: bc
BuildRequires: esound-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: freeglut-devel BuildRequires: freeglut-devel
BuildRequires: freetype2-devel BuildRequires: freetype2-devel
@ -84,7 +81,6 @@ chmod -x README docs/Revisions
%patch1 %patch1
%patch3 %patch3
%patch7 %patch7
%patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1