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: 13-Jan-2003 20:08:50
Branch: HEAD Handle: 2003011319084801
Modified files:
openpkg-src/emacs emacs.patch emacs.spec
openpkg-web news.txt
Removed files:
openpkg-src/emacs sol2-8.h
Log:
Make Solaris patching less intrusive by simplifying it.
Summary:
Revision Changes Path
1.2 +13 -0 openpkg-src/emacs/emacs.patch
1.31 +1 -4 openpkg-src/emacs/emacs.spec
1.2 +0 -10 openpkg-src/emacs/sol2-8.h
1.2698 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 emacs.patch
--- openpkg-src/emacs/emacs.patch 13 Jan 2003 17:15:37 -0000 1.1
+++ openpkg-src/emacs/emacs.patch 13 Jan 2003 19:08:49 -0000 1.2
@@ -42,3 +42,16 @@
NON_GNU_CPP=/usr/ccs/lib/cpp
;;
* ) opsys=bsd4-2 ;;
+--- /dev/null Mon Jan 13 19:51:22 2003
++++ src/s/sol2-8.h Mon Jan 13 18:15:37 2003
+@@ -0,0 +1,10 @@
++/* Handle Solaris 2.8 and 2.9 */
++
++#include "sol2-5.h"
++
++/* Avoid conflict between strings.h and iso/string_iso.h */
++
++#undef bcmp
++#undef bcopy
++#undef bzero
++
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 emacs.spec
--- openpkg-src/emacs/emacs.spec 13 Jan 2003 17:15:37 -0000 1.30
+++ openpkg-src/emacs/emacs.spec 13 Jan 2003 19:08:49 -0000 1.31
@@ -48,7 +48,6 @@
# list of sources
Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz
-Source1: sol2-8.h
Patch0: emacs.patch
# build information
@@ -74,11 +73,9 @@
%prep
%setup -q
- %patch0 -p0
+ %patch -p0
%build
- %{l_shtool} install -c -m 755 \
- %{SOURCE sol2-8.h} ${RPM_BUILD_DIR}emacs-%{version}/src/s/sol2-8.h
%{l_shtool} subst \
-e 's;/${version}/;/;g' \
-e 's;/${version};;g' \
@@ .
rm -f openpkg-src/emacs/sol2-8.h <<'@@ .'
Index: openpkg-src/emacs/sol2-8.h
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2697 -r1.2698 news.txt
--- openpkg-web/news.txt 13 Jan 2003 19:01:44 -0000 1.2697
+++ openpkg-web/news.txt 13 Jan 2003 19:08:48 -0000 1.2698
@@ -1,3 +1,4 @@
+13-Jan-2003: Upgraded package: P<emacs-21.2-20030113>
13-Jan-2003: Upgraded package: P<ncurses-5.3.20030111-20030113>
13-Jan-2003: Upgraded package: P<perl-dbi-20030113-20030113>
13-Jan-2003: Upgraded package: P<suck-4.3.1-20030113>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
