Accepting request 56151 from X11:Utilities

Accepted submit request 56151 from user prusnak

OBS-URL: https://build.opensuse.org/request/show/56151
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xlockmore?expand=0&rev=14

xlockmore.spec

@@ -19,13 +19,13 @@
 
 
 Name:           xlockmore
-BuildRequires:  bc esound-devel fdupes freeglut-devel freetype2-devel ftgl-devel gcc-c++ gltt-devel libdrm-devel pkg-config
+BuildRequires:  bc esound-devel fdupes freeglut-devel freetype2-devel ftgl-devel gcc-c++ libdrm-devel pkg-config
 License:        GPL v2 or later ; MIT License (or similar)
 Group:          System/X11/Utilities
 Provides:       xlock
 Obsoletes:      xlock
 AutoReqProv:    on
-Version:        5.28
+Version:        5.32
 Release:        2
 Summary:        Screen Saver and Locker for the X Window System
 Url:            http://www.tux.org/~bagleyd/xlockmore.html
@@ -33,33 +33,17 @@ Source:         %{name}-%{version}.tar.bz2
 Source1:        xlock.pamd
 Source2:        xlock-wrapper
 Source3:        xlock-wrapper_xorg6
-Patch:          %{name}-null.patch
 # apply even patches when X.org < 7.0 else apply odd patches
 Patch1:         %{name}-bitmaps.patch
-Patch2:         %{name}-bitmaps_xorg6.patch
 Patch3:         xlockmore-ttf_dir.patch
-Patch4:         xlockmore-ttf_dir_xorg6.patch
 # end of X.org related patches
-Patch5:         xlockmore-gltt-libttf.patch
-Patch6:         xlockmore-gltt+ftgl.patch
 Patch7:         xlockmore-strict-aliasing.patch
-Patch8:         xlockmore-null-fontset.patch
-Patch9:         xlockmore-void-return.patch
-Patch10:        xlockmore-undefined-code.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The xlock utility locks your X Window System session and runs a screen
 saver until a password is entered.
 
-
-
-Authors:
---------
-    David Albert Bagley <bagleyd@tux.org>
-    Patrick J. Naughton <naughton@eng.sun.com>
-
-%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr"
 %define _xorg7libs %_lib
 %define _xorg7libs32 lib
 %define _xorg7bin bin
@@ -71,37 +55,13 @@ Authors:
 %define _xorg7_serverincl /usr/include/xorg
 %define _xorg7_fonts /usr/share/fonts
 %define _xorg7_prefix /usr
-%else
-%define _xorg7libs X11R6/%_lib
-%define _xorg7libs32 X11R6/lib
-%define _xorg7bin X11R6/bin
-%define _xorg7_mandir /usr/X11R6/man
-%define _xorg7pixmaps X11R6/include
-%define _xorg7libshare X11R6/lib/
-%define _xorg7_xkb /etc/X11/xkb
-%define _xorg7_termcap /usr/X11R6/lib/X11/etc
-%define _xorg7_serverincl /usr/X11R6/lib/Server/include
-%define _xorg7_fonts /usr/X11R6/lib/X11/fonts
-%define _xorg7_prefix /usr/X11R6
-%endif
 
 %prep
 %setup -q
 chmod -x README docs/Revisions
-%patch
-%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr"
 %patch1
 %patch3
-%else
-%patch2
-%patch4
-%endif
-%patch5
-%patch6
 %patch7
-%patch8
-%patch9
-%patch10
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}