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: 30-Dec-2002 15:51:35
Branch: HEAD Handle: 2002123014513401
Modified files:
openpkg-src/emacs emacs.spec
openpkg-web news.txt
Log:
switch to %option(s)
Summary:
Revision Changes Path
1.27 +13 -14 openpkg-src/emacs/emacs.spec
1.2434 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 emacs.spec
--- openpkg-src/emacs/emacs.spec 20 Dec 2002 19:12:11 -0000 1.26
+++ openpkg-src/emacs/emacs.spec 30 Dec 2002 14:51:35 -0000 1.27
@@ -23,12 +23,15 @@
## SUCH DAMAGE.
##
-# the additionally used features
-# (jpeg and png options depend on with_x11)
-%ifndef with_x11
-%define with_x11 no
-%define with_jpeg no
-%define with_png no
+# 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
@@ -41,7 +44,7 @@
Group: Editor
License: GPL
Version: 21.2
-Release: 20020819
+Release: 20021230
# list of sources
Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz
@@ -49,8 +52,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, make, texinfo
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20021230, make, texinfo
+PreReq: OpenPKG, openpkg >= 20021230
%if "%{with_x11}" == "yes"
BuildPreReq: X11
PreReq: X11
@@ -67,11 +70,7 @@
%description
The popular GNU EMACS text editor.
- Options:
- --define 'with_fsl %{with_fsl}'
- --define 'with_x11 %{with_x11}'
- --define 'with_jpeg %{with_jpeg}'
- --define 'with_png %{with_png}'
+ %options -p10
%prep
%setup -q
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2433 -r1.2434 news.txt
--- openpkg-web/news.txt 30 Dec 2002 14:47:42 -0000 1.2433
+++ openpkg-web/news.txt 30 Dec 2002 14:51:34 -0000 1.2434
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<emacs-21.2-20021230>
30-Dec-2002: Upgraded package: P<bison-1.35-20021230>
30-Dec-2002: Upgraded package: P<cvs-1.11.4-20021230>
30-Dec-2002: Upgraded package: P<al-0.9.1-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
