OBS User unknown
2007-08-09 21:00:51 +00:00
committed by Git OBS Bridge
parent 07695ddc69
commit cda3adccad
7 changed files with 145 additions and 33 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package xlockmore (Version 5.23)
# spec file for package xlockmore (Version 5.24)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,19 +11,14 @@
# norootforbuild
Name: xlockmore
BuildRequires: bc esound-devel freeglut-devel freetype2-devel gcc-c++ libdrm-devel pkgconfig
%if %suse_version > 1010
BuildRequires: ftgl-devel
%else
BuildRequires: ftgl
%endif
License: Other License(s), see package
BuildRequires: bc esound-devel fdupes freeglut-devel freetype2-devel ftgl-devel gcc-c++ gltt-devel libdrm-devel pkg-config
License: GPL v2 or later, X11/MIT
Group: System/X11/Utilities
Provides: xlock
Obsoletes: xlock
Autoreqprov: on
Version: 5.23
Release: 8
Version: 5.24
Release: 1
Summary: Screen Saver and Locker for the X Window System
URL: http://www.tux.org/~bagleyd/xlockmore.html
Source: %{name}-%{version}.tar.bz2
@@ -37,6 +32,9 @@ 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -85,30 +83,27 @@ Authors:
%patch2
%patch4
%endif
%patch5
%patch6
%patch7
%build
%{?suse_update_config:%{suse_update_config -f}}
aclocal
autoconf
export CPPFLAGS=-I/usr/include/FTGL
%ifarch %arm
# ICE workaround
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O1"
%endif
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CPPFLAGS="-I/usr/include/FTGL"
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
./configure \
--prefix=%{_xorg7_prefix} \
--with-libraries=%{_libdir} \
--without-motif \
-without-gtk \
-without-gtk2 \
--with-passwd-helper=/sbin/unix2_chkpwd \
--disable-bomb \
--enable-vtlock \
--disable-gtk \
--enable-use-mb \
--x-includes=%{_xorg7_prefix}/include \
--prefix=%{_xorg7_prefix}\
--with-libraries=%{_libdir}\
--without-motif\
--without-gtk\
--with-passwd-helper=/sbin/unix2_chkpwd\
--disable-bomb\
--enable-vtlock\
--enable-use-mb\
--x-includes=%{_xorg7_prefix}/include\
--x-libraries=%{_xorg7_prefix}/%_lib
make %{?jobs:-j%jobs}
@@ -132,6 +127,8 @@ install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/%{_xorg7bin}/xlock
install -m 755 %{S:3} $RPM_BUILD_ROOT/usr/%{_xorg7bin}/xlock
%endif
%fdupes $RPM_BUILD_ROOT/usr
%clean
rm -rf $RPM_BUILD_ROOT
@@ -140,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_xorg7_mandir}/man1/xlock.1x.gz
%doc README docs/cell_automata docs/Purify docs/Revisions docs/TODO
%config /etc/pam.d/xlock
%config /usr/%{_xorg7libshare}/X11/app-defaults/XLock
/usr/%{_xorg7libshare}/X11/app-defaults/XLock
/usr/%{_xorg7bin}/xlock
/usr/%{_xorg7libs32}/xlock
/usr/%{_xorg7pixmaps}/X11/bitmaps/*
@@ -150,7 +147,28 @@ rm -rf $RPM_BUILD_ROOT
%dir /usr/X11R6/include/X11/pixmaps
%endif
%changelog -n xlockmore
%changelog
* Tue Aug 07 2007 - sbrabec@suse.cz
- Updated to version 5.24:
* penrose added to xlock95.
* xcl added with a fix for DefaultScreen, which should not be
there since xlock is a multiscreen program.
* Patch for solitare and reducing binary size for xlock95.
* dilemma, voters, wator hexagonal/triangular drawing
improvements.
* More triangular/hexagonal life.
* Fixes for old options for command line -rule S2b34B2a and
-rule S2a2b4aB2a3a4b using -neighbors 6.
* Fixes for hexagonal diagonal shooters.
* Added new hexagonal life -rule S35B2 and S3B245.
* Added many new triangular life rules with gliders.
* Updated random soup to include multiple symmetries.
* Added options runtime -glidersearch and -patternsearch.
* Added -repeat num option to help find patterns that do not
repeat in num periods.
* Added -vertical option to more modules.
* DirectColor fixes for password window.
- Build with GLTT and FTGL modules.
* Wed Nov 15 2006 - dmueller@suse.de
- build against freetype2, not freetype
* Mon Oct 23 2006 - sbrabec@suse.cz