OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 03-Jan-2003 12:24:14
Branch: HEAD Handle: 2003010311241201
Modified files:
openpkg-src/emacs emacs.spec
openpkg-web news.txt
Log:
upgrade to new %option world order
Summary:
Revision Changes Path
1.29 +14 -16 openpkg-src/emacs/emacs.spec
1.2516 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 emacs.spec
--- openpkg-src/emacs/emacs.spec 30 Dec 2002 22:03:42 -0000 1.28
+++ openpkg-src/emacs/emacs.spec 3 Jan 2003 11:24:13 -0000 1.29
@@ -23,17 +23,6 @@
## SUCH DAMAGE.
##
-# package options
-%option with_x11 no
-%option with_jpeg no
-%option with_png no
-
-# package option dependencies
-%if "%{with_jpeg}" == "yes" || "%{with_png}" == "yes"
-%undefine with_x11
-%define with_x11 yes
-%endif
-
# package information
Name: emacs
Summary: The GNU EMACS Text Editor
@@ -44,7 +33,18 @@
Group: Editor
License: GPL
Version: 21.2
-Release: 20021230
+Release: 20030103
+
+# package options
+%option with_x11 %{l_test -p x11}
+%option with_jpeg no
+%option with_png no
+
+# package option dependencies
+%if "%{with_jpeg}" == "yes" || "%{with_png}" == "yes"
+%undefine with_x11
+%define with_x11 yes
+%endif
# list of sources
Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz
@@ -52,8 +52,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021230, make, texinfo
-PreReq: OpenPKG, openpkg >= 20021230
+BuildPreReq: OpenPKG, openpkg >= 20030103, make, texinfo
+PreReq: OpenPKG, openpkg >= 20030103
%if "%{with_x11}" == "yes"
BuildPreReq: X11
PreReq: X11
@@ -69,8 +69,6 @@
%description
The popular GNU EMACS text editor.
-
- %options -p10
%prep
%setup -q
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2515 -r1.2516 news.txt
--- openpkg-web/news.txt 3 Jan 2003 11:23:53 -0000 1.2515
+++ openpkg-web/news.txt 3 Jan 2003 11:24:12 -0000 1.2516
@@ -1,3 +1,4 @@
+03-Jan-2003: New package: P<emacs-21.2-20030103>
03-Jan-2003: New package: P<flex-2.5.4a-20030103>
03-Jan-2003: New package: P<cvs-1.11.4-20030103>
03-Jan-2003: New package: P<bison-1.35-20030103>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
