[mona] Update to 1.4-14. Make "guide", which is undefined on purpose, a weak symbol.

Jerry James jjames at fedoraproject.org
Mon Apr 29 15:55:24 UTC 2013


commit be8a38dfd79808836e7542282498b268a0a96936
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Mon Apr 29 09:55:07 2013 -0600

    Update to 1.4-14.
    Make "guide", which is undefined on purpose, a weak symbol.

 .gitignore |    4 ++--
 mona.spec  |   15 ++++++++++++---
 sources    |    2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 103a087..d125cc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-mona-1.4-13.tar.gz
-mona14.pdf
+/mona14.pdf
+/mona-1.4-14.tar.gz
diff --git a/mona.spec b/mona.spec
index 4a66387..ca5e960 100644
--- a/mona.spec
+++ b/mona.spec
@@ -1,9 +1,9 @@
 %define upver 1.4
-%define uprel 13
+%define uprel 14
 
 Name:           mona
 Version:        %{upver}r%{uprel}
-Release:        8%{?dist}
+Release:        1%{?dist}
 Summary:        A decision procedure for the WS1S and WS2S logics
 
 Group:          Applications/Engineering
@@ -90,6 +90,11 @@ Source Elisp code for XEmacs mode for editing Mona files.
 %setup -q -n %{name}-%{upver}
 cp -p %{SOURCE1} .
 
+# Make an intentionally-undefined symbol weak
+sed '/^using/i#pragma weak guide\n' Front/lib.cpp > Front/lib.cpp.new
+touch -r Front/lib.cpp Front/lib.cpp.new
+mv -v Front/lib.cpp.new Front/lib.cpp
+
 %build
 %configure --disable-static
 make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}"
@@ -159,6 +164,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/mona-mode.el .
 %{_xemacs_sitelispdir}/mona-mode.el
 
 %changelog
+* Mon Apr 29 2013 Jerry James <loganjerry at gmail.com> - 1.4r14-1
+- Update to 1.4-14
+- Make "guide", which is undefined on purpose, a weak symbol
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4r13-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -186,7 +195,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/mona-mode.el .
 * Mon Aug 11 2008 Jerry James <loganjerry at gmail.com> - 1.4r13-1
 - Update to 1.4-13
 
-* Mon Jun 17 2008 Jerry James <loganjerry at gmail.com> - 1.4r11-1
+* Tue Jun 17 2008 Jerry James <loganjerry at gmail.com> - 1.4r11-1
 - Update to 1.4-11
 - Add the user manual to the main package docs
 
diff --git a/sources b/sources
index b14d3cd..fd1b5bb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-60f5ea4cc0c470dd0e72731836536f03  mona-1.4-13.tar.gz
+9c9b3685d5667a43a28c3f534e80d565  mona-1.4-14.tar.gz
 950230866dee8461be7a5f54e0ee8d1a  mona14.pdf


More information about the scm-commits mailing list