rpms/gcl/devel gcl-2.6.8-plt.patch,1.2,1.3 gcl.spec,1.41,1.42
Jerry James
jjames at fedoraproject.org
Mon Nov 30 19:24:03 UTC 2009
- Previous message (by thread): rpms/gcl/F-12 gcl-2.6.8-plt.patch,1.2,1.3 gcl.spec,1.41,1.42
- Next message (by thread): rpms/inkscape/F-11 inkscape-20091101svn-icon.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 import.log, 1.4, 1.5 inkscape-20090925svn-el5.patch, 1.1, 1.2 inkscape.spec, 1.81, 1.82 sources, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jjames
Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1868/devel
Modified Files:
gcl-2.6.8-plt.patch gcl.spec
Log Message:
* Mon Nov 30 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.7.20090701cvs
- Fix scripts to reflect actual installation order (bz 541050)
- Update PLT patch for GNU ld >= 2.19 (bz 542004)
- Use (X)Emacs macros to simplify the spec file
gcl-2.6.8-plt.patch:
makefile | 2 +-
plt.c | 29 +++++++++++++++++++++--------
2 files changed, 22 insertions(+), 9 deletions(-)
Index: gcl-2.6.8-plt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-plt.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcl-2.6.8-plt.patch 20 Oct 2009 22:11:47 -0000 1.2
+++ gcl-2.6.8-plt.patch 30 Nov 2009 19:24:02 -0000 1.3
@@ -1,6 +1,6 @@
diff -dur gcl-2.6.8.ORIG/o/makefile gcl-2.6.8/o/makefile
---- gcl-2.6.8.ORIG/o/makefile 2009-08-11 15:11:17.769474923 -0600
-+++ gcl-2.6.8/o/makefile 2009-08-11 15:11:46.167645473 -0600
+--- gcl-2.6.8.ORIG/o/makefile 2009-11-30 09:43:39.243683779 -0700
++++ gcl-2.6.8/o/makefile 2009-11-30 09:44:35.280367565 -0700
@@ -149,7 +149,7 @@
$(CC) -c $(CFLAGS) $(DEFS) $*.c $(AUX_INFO)
@@ -12,13 +12,52 @@ diff -dur gcl-2.6.8.ORIG/o/makefile gcl-
sort | \
diff -dur gcl-2.6.8.ORIG/o/plt.c gcl-2.6.8/o/plt.c
--- gcl-2.6.8.ORIG/o/plt.c 2008-08-03 09:16:22.000000000 -0600
-+++ gcl-2.6.8/o/plt.c 2009-08-11 15:12:26.627506327 -0600
-@@ -135,7 +135,7 @@
- for (i=j=0,li=Cnil;fgets(b,sizeof(b),f);) {
++++ gcl-2.6.8/o/plt.c 2009-11-30 09:51:31.262417304 -0700
+@@ -102,6 +102,12 @@
+
+ }
+
++/* Parser statse */
++#define NOTHING 0 /* initial state */
++#define PLT 1 /* reading plt */
++#define NEWLINE 2 /* reading empty line after .iplt */
++#define IPLT 3 /* reading iplt */
++
+ int
+ parse_plt() {
+
+@@ -132,19 +138,26 @@
+ return 0;
+ if (!(f=fopen(b1,"r")))
+ FEerror("Cannot open map file", 0);
+- for (i=j=0,li=Cnil;fgets(b,sizeof(b),f);) {
++ for (i=NOTHING,j=0,li=Cnil;fgets(b,sizeof(b),f);) {
if (!memchr(b,10,sizeof(b)-1))
FEerror("plt buffer too small", 0);
- if (memcmp(b," .plt",4) && !i)
-+ if ((memcmp(b," .plt",5) || memcmp(b," .iplt",6)) && !i)
++ if (i == NOTHING) {
++ if (memcmp(b," .plt",5) == 0)
++ i = PLT;
++ else if (memcmp(b," .iplt",6) == 0)
++ i = NEWLINE;
continue;
++ }
if (*b=='\r' || *b=='\n') {
- i=0;
+- i=0;
++ i = (i == NEWLINE) ? PLT : NOTHING;
+ continue;
+- } else
+- if (!i) {
+- i=1;
+- continue;
+- }
++ }
++ if (b[1] != ' ') {
++ /* There is at least one "annotation" line before the iplt information */
++ if (i != NEWLINE)
++ i = NOTHING;
++ continue;
++ }
+ if (sscanf(b,"%lx%n",&u,&n)!=1)
+ FEerror("Cannot read address", 0);
+ for (c=b+n;*c==32;c++);
Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gcl.spec 20 Oct 2009 22:11:47 -0000 1.41
+++ gcl.spec 30 Nov 2009 19:24:02 -0000 1.42
@@ -5,30 +5,9 @@
# Prerelease of 2.6.8
%global alphatag 20090701cvs
-# If the emacs-el package has installed a pkgconfig file, use that to determine
-# install locations and Emacs version at build time, otherwise set defaults.
-%if %($(pkg-config emacs) ; echo $?)
-%global emacs_version 22.2
-%global emacs_lispdir %{_datadir}/emacs/site-lisp
-%else
-%global emacs_version %(pkg-config emacs --modversion)
-%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
-%endif
-
-# If the xemacs-devel package has installed a pkgconfig file, use that to
-# determine install locations and Emacs version at build time, otherwise set
-# defaults.
-%if %($(pkg-config xemacs) ; echo $?)
-%global xemacs_version 21.5
-%global xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
-%else
-%global xemacs_version %(pkg-config xemacs --modversion)
-%global xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
-%endif
-
Name: gcl
Version: 2.6.8
-Release: 0.6.%{alphatag}%{?dist}
+Release: 0.7.%{alphatag}%{?dist}
Summary: GNU Common Lisp
Group: Development/Languages
@@ -139,7 +118,7 @@ facile portability. Currently uses TCL/T
%package emacs
Group: Development/Languages
Summary: Emacs mode for interacting with GCL
-Requires: %{name} = %{version}-%{release}, emacs(bin) >= %{emacs_version}
+Requires: %{name} = %{version}-%{release}, emacs(bin) >= %{_emacs_version}
BuildArch: noarch
%description emacs
@@ -159,7 +138,7 @@ Source Elisp code for Emacs mode for int
Group: Development/Languages
Summary: XEmacs mode for interacting with GCL
Requires: %{name} = %{version}-%{release}
-Requires: xemacs(bin) >= %{xemacs_version}, xemacs-packages-extra
+Requires: xemacs(bin) >= %{_xemacs_version}, xemacs-packages-extra
BuildArch: noarch
%description xemacs
@@ -260,26 +239,26 @@ mkdir -p html
cp -pfr info/gcl-si info/gcl-tk html
# Install and compile the Emacs code
-mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
-cp -pfr elisp/* $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
-rm -f $RPM_BUILD_ROOT%{emacs_lispdir}/gcl/makefile
-rm -f $RPM_BUILD_ROOT%{emacs_lispdir}/gcl/readme
-mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/site-start.d
-sed -e "s|%LISP_DIR%|%{emacs_lispdir}|" %{SOURCE1} > $RPM_BUILD_ROOT%{emacs_lispdir}/site-start.d/gcl.el
-pushd $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
-emacs -batch -no-site-file --eval "(push \"`pwd`\" load-path)" \
- -f batch-byte-compile *.el
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/gcl
+cp -pfr elisp/* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/gcl
+rm -f $RPM_BUILD_ROOT%{_emacs_sitelispdir}/gcl/makefile
+rm -f $RPM_BUILD_ROOT%{_emacs_sitelispdir}/gcl/readme
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+sed -e "s|%LISP_DIR%|%{_emacs_sitelispdir}|" %{SOURCE1} > $RPM_BUILD_ROOT%{_emacs_sitestartdir}/gcl.el
+pushd $RPM_BUILD_ROOT%{_emacs_sitelispdir}/gcl
+emacs -batch --no-init-file --no-site-file \
+ --eval "(push \"`pwd`\" load-path)" -f batch-byte-compile *.el
popd
# Install and compile the XEmacs code
-mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
-cp -fr elisp/* $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
-rm -f $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl/makefile
-rm -f $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl/readme
-mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/site-start.d
-sed -e "s|%LISP_DIR%|%{xemacs_lispdir}|" %{SOURCE1} > $RPM_BUILD_ROOT%{xemacs_lispdir}/site-start.d/gcl.el
-pushd $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
-xemacs -batch -no-site-file -eval "(push \"`pwd`\" load-path)" \
+mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/gcl
+cp -fr elisp/* $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/gcl
+rm -f $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/gcl/makefile
+rm -f $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/gcl/readme
+mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
+sed -e "s|%LISP_DIR%|%{_xemacs_sitelispdir}|" %{SOURCE1} > $RPM_BUILD_ROOT%{_xemacs_sitestartdir}/gcl.el
+pushd $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/gcl
+xemacs -q -no-site-file -batch -eval "(push \"`pwd`\" load-path)" \
-f batch-byte-compile *.el
popd
@@ -306,11 +285,11 @@ rm -f /tmp/gazonk_* /tmp/gcl_*
/sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir \
--entry="* gcl-tk: (gcl-tk). GNU Common Lisp Tk Manual." \
2>/dev/null || :
+/sbin/fixfiles -R gcl restore || :
%post selinux
/usr/sbin/semodule -i %{_datadir}/selinux/packages/gcl/gcl.pp || :
-/sbin/fixfiles -R gcl restore || :
%postun
@@ -340,24 +319,24 @@ fi
%files emacs
%defattr(-,root,root,-)
%doc elisp/readme
-%dir %{emacs_lispdir}/gcl
-%{emacs_lispdir}/gcl/*.elc
-%{emacs_lispdir}/site-start.d/*
+%dir %{_emacs_sitelispdir}/gcl
+%{_emacs_sitelispdir}/gcl/*.elc
+%{_emacs_sitestartdir}/*
%files emacs-el
%defattr(-,root,root,-)
-%{emacs_lispdir}/gcl/*.el
+%{_emacs_sitelispdir}/gcl/*.el
%files xemacs
%defattr(-,root,root,-)
%doc elisp/readme
-%dir %{xemacs_lispdir}/gcl
-%{xemacs_lispdir}/gcl/*.elc
-%{xemacs_lispdir}/site-start.d/*
+%dir %{_xemacs_sitelispdir}/gcl
+%{_xemacs_sitelispdir}/gcl/*.elc
+%{_xemacs_sitestartdir}/*
%files xemacs-el
%defattr(-,root,root,-)
-%{xemacs_lispdir}/gcl/*.el
+%{_xemacs_sitelispdir}/gcl/*.el
%files selinux
%defattr(-,root,root,-)
@@ -365,6 +344,11 @@ fi
%changelog
+* Mon Nov 30 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.7.20090701cvs
+- Fix scripts to reflect actual installation order (bz 541050)
+- Update PLT patch for GNU ld >= 2.19 (bz 542004)
+- Use (X)Emacs macros to simplify the spec file
+
* Tue Oct 20 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.6.20090701cvs
- Update SELinux policy for confined users (bz 529757)
- Previous message (by thread): rpms/gcl/F-12 gcl-2.6.8-plt.patch,1.2,1.3 gcl.spec,1.41,1.42
- Next message (by thread): rpms/inkscape/F-11 inkscape-20091101svn-icon.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 import.log, 1.4, 1.5 inkscape-20090925svn-el5.patch, 1.1, 1.2 inkscape.spec, 1.81, 1.82 sources, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list