pool/xlockmore
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 172928 from home:dimstar:branches:X11:Utilities

Browse Source 
- Add libXdmcp-devel and libXt-devel BuildRequires: we include
  headers from the respective toolkits / libraries and as
  such it's only correct to BuildRequire the -devel package
  bringing these headers to us.

OBS-URL: https://build.opensuse.org/request/show/172928
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xlockmore?expand=0&rev=16
This commit is contained in:
Petr Gajdos 2013-04-23 11:07:33 +00:00 committed by Git OBS Bridge
parent 294c59d1c7
commit 602d1d606c
2 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xlockmore.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Apr 22 20:07:48 UTC 2013 - dimstar@opensuse.org
- Add libXdmcp-devel and libXt-devel BuildRequires: we include
headers from the respective toolkits / libraries and as
such it's only correct to BuildRequire the -devel package
bringing these headers to us.
-------------------------------------------------------------------
Fri Feb 1 12:00:26 UTC 2013 - coolo@suse.com

73
xlockmore.spec
View File

@ -17,18 +17,6 @@
Name: xlockmore
BuildRequires: automake
BuildRequires: bc
BuildRequires: esound-devel
BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: freetype2-devel
BuildRequires: ftgl-devel
BuildRequires: gcc-c++
BuildRequires: libdrm-devel
BuildRequires: pkg-config
Provides: xlock
Obsoletes: xlock
Version: 5.34
Release: 0
Summary: Screen Saver and Locker for the X Window System
@ -41,21 +29,36 @@ Source2: xlock-wrapper
Source3: xlock-wrapper_xorg6
# apply even patches when X.org < 7.0 else apply odd patches
Patch1: %{name}-bitmaps.patch
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
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
BuildRequires: automake
BuildRequires: bc
BuildRequires: esound-devel
BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: freetype2-devel
BuildRequires: ftgl-devel
BuildRequires: gcc-c++
BuildRequires: libXdmcp-devel
BuildRequires: libXt-devel
BuildRequires: libdrm-devel
BuildRequires: pkg-config
Provides: xlock
Obsoletes: xlock
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.
%define _xorg7libs %_lib
%define _xorg7libs %{_lib}
%define _xorg7libs32 lib
%define _xorg7bin bin
%define _xorg7_mandir %_mandir
%define _xorg7_mandir %{_mandir}
%define _xorg7pixmaps include
%define _xorg7libshare share
%define _xorg7_xkb /usr/share/X11/xkb
@ -76,8 +79,8 @@ chmod -x README docs/Revisions
aclocal
autoconf
export CPPFLAGS="-I/usr/include/FTGL"
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
./configure \
--prefix=%{_xorg7_prefix}\
--with-libraries=%{_libdir}\
@ -89,36 +92,36 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
--enable-use-mb\
--disable-allow-root\
--x-includes=%{_xorg7_prefix}/include\
--x-libraries=%{_xorg7_prefix}/%_lib
make %{?jobs:-j%jobs}
--x-libraries=%{_xorg7_prefix}/%{_lib}
make %{?_smp_mflags}
%install
install -d -m 755 $RPM_BUILD_ROOT/etc/pam.d
install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7bin}/
install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/app-defaults/
install -d -m 755 $RPM_BUILD_ROOT%{_xorg7_mandir}/man1/
install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7libs32}/xlock
install -m 755 xlock/xlock $RPM_BUILD_ROOT/usr/%{_xorg7libs32}/xlock/xlock
install -m 644 xlock/XLock.ad $RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/app-defaults/XLock
install -m 644 xlock/xlock.man $RPM_BUILD_ROOT%{_xorg7_mandir}/man1/xlock.1x
install -m 644 %{S:1} $RPM_BUILD_ROOT/etc/pam.d/xlock
install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7bin}/
install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/app-defaults/
install -d -m 755 %{buildroot}%{_xorg7_mandir}/man1/
install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7libs32}/xlock
install -m 755 xlock/xlock %{buildroot}%{_prefix}/%{_xorg7libs32}/xlock/xlock
install -m 644 xlock/XLock.ad %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/app-defaults/XLock
install -m 644 xlock/xlock.man %{buildroot}%{_xorg7_mandir}/man1/xlock.1x
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/xlock
%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr"
install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/%{_xorg7bin}/xlock
install -m 755 %{SOURCE2} %{buildroot}%{_prefix}/%{_xorg7bin}/xlock
%else
install -m 755 %{S:3} $RPM_BUILD_ROOT/usr/%{_xorg7bin}/xlock
install -m 755 %{SOURCE3} %{buildroot}%{_prefix}/%{_xorg7bin}/xlock
%endif
%fdupes $RPM_BUILD_ROOT/usr
%fdupes %{buildroot}/usr
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf %{buildroot}
%files
%defattr(-, root, root)
%doc %{_xorg7_mandir}/man1/xlock.1x.gz
%doc README docs/cell_automata docs/Purify docs/Revisions docs/TODO
%config /etc/pam.d/xlock
/usr/%{_xorg7libshare}/X11/app-defaults
/usr/%{_xorg7bin}/xlock
/usr/%{_xorg7libs32}/xlock
%config %{_sysconfdir}/pam.d/xlock
%{_prefix}/%{_xorg7libshare}/X11/app-defaults
%{_prefix}/%{_xorg7bin}/xlock
%{_prefix}/%{_xorg7libs32}/xlock
%changelog