|
@@ -5,8 +5,8 @@
|
|
# % define withgl 1
|
|
# % define withgl 1
|
|
|
|
|
|
%define name %{orgname}%{?withgl:_gl}
|
|
%define name %{orgname}%{?withgl:_gl}
|
|
-%define version 5.31
|
|
+%define version 5.32
|
|
-%define release 2%{?_dist_release}
|
|
+%define release 1%{?_dist_release}
|
|
|
|
|
|
Summary: An X terminal locking program.
|
|
Summary: An X terminal locking program.
|
|
Summary(ja): X 端末をロックするためのプログラム
|
|
Summary(ja): X 端末をロックするためのプログラム
|
|
@@ -16,7 +16,7 @@ Release: %{release}
|
|
License: MIT
|
|
License: MIT
|
|
Group: User Interface/X
|
|
Group: User Interface/X
|
|
URL: http://www.tux.org/~bagleyd/xlockmore.html
|
|
URL: http://www.tux.org/~bagleyd/xlockmore.html
|
|
-Source0: ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/xlockmore-%{version}.tar.bz2
|
|
+Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-%{version}/xlockmore-%{version}.tar.bz2
|
|
Source1: m-redhat.xpm
|
|
Source1: m-redhat.xpm
|
|
Source2: m-redhat.xbm
|
|
Source2: m-redhat.xbm
|
|
Source3: s-redhat.xpm
|
|
Source3: s-redhat.xpm
|
|
@@ -25,15 +25,17 @@ Source5: xlock.pamd
|
|
Patch0: xlockmore-5.02-sounddir.patch
|
|
Patch0: xlockmore-5.02-sounddir.patch
|
|
BuildRequires: esound-devel, audiofile-devel
|
|
BuildRequires: esound-devel, audiofile-devel
|
|
Requires: pam >= 0.59, esound, audiofile, fortune-mod
|
|
Requires: pam >= 0.59, esound, audiofile, fortune-mod
|
|
|
|
+Requires: xorg-x11-jpfonts
|
|
BuildRequires: flex
|
|
BuildRequires: flex
|
|
BuildRequires: pam-devel
|
|
BuildRequires: pam-devel
|
|
BuildRequires: libX11-devel
|
|
BuildRequires: libX11-devel
|
|
BuildRequires: libXt-devel
|
|
BuildRequires: libXt-devel
|
|
BuildRequires: libXinerama-devel
|
|
BuildRequires: libXinerama-devel
|
|
BuildRequires: libXext-devel
|
|
BuildRequires: libXext-devel
|
|
-%{?withgl:Requires: Mesa, gle}
|
|
+%{?withgl:BuildRequires: libGLU-devel}
|
|
-%{?withgl:BuildPreReq: Mesa-devel, gle-devel}
|
|
|
|
%{?withgl:Provides: xlockmore}
|
|
%{?withgl:Provides: xlockmore}
|
|
|
|
+BuildRequires: gtk2-devel
|
|
|
|
+
|
|
Conflicts: %{orgname}%{!?withgl:_gl}
|
|
Conflicts: %{orgname}%{!?withgl:_gl}
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
@@ -82,6 +84,7 @@ cp %{_sourcedir}/s-redhat.xbm bitmaps/s-redhat.xbm
|
|
#%configure --prefix=/usr --exec-prefix=/usr/X11R6/ --bindir=/usr/X11R6/bin \
|
|
#%configure --prefix=/usr --exec-prefix=/usr/X11R6/ --bindir=/usr/X11R6/bin \
|
|
# --mandir=/usr/X11R6/man/man1 --without-motif --without-gtk --enable-pam \
|
|
# --mandir=/usr/X11R6/man/man1 --without-motif --without-gtk --enable-pam \
|
|
# --with-esound %{glflag} %{nglflag}
|
|
# --with-esound %{glflag} %{nglflag}
|
|
|
|
+
|
|
%configure --without-motif --without-gtk --without-gtk2 --enable-pam --with-esound %{glflag} %{nglflag}
|
|
%configure --without-motif --without-gtk --without-gtk2 --enable-pam --with-esound %{glflag} %{nglflag}
|
|
|
|
|
|
make
|
|
make
|
|
@@ -131,6 +134,11 @@ rm -rf %{buildroot}
|
|
%{_mandir}/man1/xlock.*
|
|
%{_mandir}/man1/xlock.*
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Thu Dec 30 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.32-1
|
|
|
|
+- new upstream release
|
|
|
|
+- add Requires: xorg-x11-jpfonts
|
|
|
|
+- add BuildRequires: gtk2-devel
|
|
|
|
+
|
|
* Sun Aug 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 5.31-2
|
|
* Sun Aug 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 5.31-2
|
|
- changed Group to User Interface/X
|
|
- changed Group to User Interface/X
|
|
- added Japanese summary
|
|
- added Japanese summary
|