[alliance] Add missing tex BRs (#913874, #991959, #1105945)

Till Maas till at fedoraproject.org
Tue Jul 1 16:07:44 UTC 2014 

commit 4f2a7ec77b8e07a71e4e1f859823e6bda26b2e29
Author: Till Maas <opensource at till.name>
Date:   Tue Jul 1 18:07:48 2014 +0200

    Add missing tex BRs (#913874, #991959, #1105945)
    
    - Fix FTBFS with -Werror=format-security
    - Fix FTBFS with latest bison
    - Remove unneeded macros

 alliance-5.0-20090901-bison.patch           |   25 ++++++++
 alliance-5.0-20090901-format-security.patch |   85 +++++++++++++++++++++++++++
 alliance.spec                               |   27 +++++----
 3 files changed, 126 insertions(+), 11 deletions(-)
---
diff --git a/alliance-5.0-20090901-bison.patch b/alliance-5.0-20090901-bison.patch
new file mode 100644
index 0000000..62998be
--- /dev/null
+++ b/alliance-5.0-20090901-bison.patch
@@ -0,0 +1,25 @@
+From debian/patches/10-fix-parser-extern.patch
+Fix duplicate extern error with newer bison
+
+--- a/ppt/src/Makefile.am
++++ b/ppt/src/Makefile.am
+@@ -19,7 +19,7 @@ pat_decl_y.c pat_decl_y.h : $(srcdir)/pat_decl_y.y
+ 	$(YACC) -d $(YFLAGS) $(srcdir)/pat_decl_y.y \
+ 	&& sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c \
+ 	 | sed -e "s/int[	 ]*pat_decl_y_char;/extern int pat_decl_y_char;/" \
+-	 | sed -e "s/PAT_DECL_Y_STYPE[	 ]*pat_decl_y_lval;/extern PAT_DECL_Y_STYPE pat_decl_y_lval;/" \
++	 | sed -e "s/PAT_DECL_Y_STYPE[	 ]*pat_decl_y_lval;/PAT_DECL_Y_STYPE pat_decl_y_lval;/" \
+ 	 | sed -e "s/int[	 ]*pat_decl_y_nerrs;/extern int pat_decl_y_nerrs;/" \
+          > pat_decl_y.c \
+ 	&& sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h
+--- a/ppt/src/Makefile.in
++++ b/ppt/src/Makefile.in
+@@ -701,7 +701,7 @@ pat_decl_y.c pat_decl_y.h : $(srcdir)/pat_decl_y.y
+ 	$(YACC) -d $(YFLAGS) $(srcdir)/pat_decl_y.y \
+ 	&& sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c \
+ 	 | sed -e "s/int[	 ]*pat_decl_y_char;/extern int pat_decl_y_char;/" \
+-	 | sed -e "s/PAT_DECL_Y_STYPE[	 ]*pat_decl_y_lval;/extern PAT_DECL_Y_STYPE pat_decl_y_lval;/" \
++	 | sed -e "s/PAT_DECL_Y_STYPE[	 ]*pat_decl_y_lval;/PAT_DECL_Y_STYPE pat_decl_y_lval;/" \
+ 	 | sed -e "s/int[	 ]*pat_decl_y_nerrs;/extern int pat_decl_y_nerrs;/" \
+          > pat_decl_y.c \
+ 	&& sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h
diff --git a/alliance-5.0-20090901-format-security.patch b/alliance-5.0-20090901-format-security.patch
new file mode 100644
index 0000000..de54d36
--- /dev/null
+++ b/alliance-5.0-20090901-format-security.patch
@@ -0,0 +1,85 @@
+--- a/rtd/src/rtd_drive.c
++++ b/rtd/src/rtd_drive.c
+@@ -100,7 +100,7 @@ static void RtlWriteNameFile( Name )
+     RtlExprLength = Length;
+   }
+ 
+-  fprintf( RtlFile, Name );
++  fprintf( RtlFile, "%s", Name );
+ }
+ 
+ /*------------------------------------------------------------\
+--- a/vpd/src/vpd_drive.c
++++ b/vpd/src/vpd_drive.c
+@@ -100,7 +100,7 @@ static void VpnWriteNameFile( Name )
+     VpnExprLength = Length;
+   }
+ 
+-  fprintf( VpnFile, Name );
++  fprintf( VpnFile, "%s", Name );
+ }
+ 
+ /*------------------------------------------------------------\
+--- a/boog/src/bog_normalize_message.c
++++ b/boog/src/bog_normalize_message.c
+@@ -106,7 +106,7 @@ extern void display_error_in_abl(char* message, chain_list *abl)
+    }
+ 
+    fprintf(stderr,"BEH: ");
+-   fprintf(stderr,message);
++   fprintf(stderr,"%s",message);
+    fprintf(stderr," in '");
+    fflush(stderr);
+    display_abl(abl);
+--- a/l2p/src/drive_ps.c
++++ b/l2p/src/drive_ps.c
+@@ -83,22 +83,22 @@ char	*msg;
+ 		break;
+ 		case E_OPEN :
+ 			fprintf (stderr, "Problem while opening file ");
+-			fprintf (stderr, msg);
++			fprintf (stderr, "%s", msg);
+ 		break;
+ 		case E_CLOSE :
+ 			fprintf (stderr, "Problem while closing file ");
+-			fprintf (stderr, msg);
++			fprintf (stderr, "%s", msg);
+ 		break;
+ 		case E_WRITE :
+ 			fprintf (stderr, "Problem while writing file ");
+-			fprintf (stderr, msg);
++			fprintf (stderr, "%s", msg);
+ 		break;
+ 		case E_READ :
+ 			fprintf (stderr, "Problem while reading file ");
+-			fprintf (stderr, msg);
++			fprintf (stderr, "%s", msg);
+ 		break;
+ 		case E_OUTBOX :
+-			fprintf (stderr, msg);
++			fprintf (stderr, "%s", msg);
+ 		break;
+ 		default :
+ 			fprintf (stderr, "Unknow internal error");
+--- a/loon/src/lon_normalize_message.c
++++ b/loon/src/lon_normalize_message.c
+@@ -106,7 +106,7 @@ extern void display_error_in_abl(char* message, chain_list *abl)
+    }
+ 
+    fprintf(stderr,"BEH: ");
+-   fprintf(stderr,message);
++   fprintf(stderr,"%s",message);
+    fprintf(stderr," in '");
+    fflush(stderr);
+    display_abl(abl);
+--- a/sea/src/util_LEFDEF.c
++++ b/sea/src/util_LEFDEF.c
+@@ -213,7 +213,7 @@ extern char *MBK2DEF_name(asLEF, asMBK)
+     *pI = (char)0; pI += 1;
+     sprintf (asLEF, "%s(%s)", sTmp, pI);
+   } else {
+-    sprintf (asLEF, sTmp);
++    sprintf (asLEF, "%s", sTmp);
+   }
+ 
+   return (asLEF);
diff --git a/alliance.spec b/alliance.spec
index 3e1627e..e6cdbde 100644
--- a/alliance.spec
+++ b/alliance.spec
@@ -4,7 +4,7 @@
 
 Name:          alliance
 Version:       5.0
-Release:       38.%{snapshot}snap%{?dist}
+Release:       39.%{snapshot}snap%{?dist}
 Summary:       VLSI EDA System
 
 License:       GPLv2
@@ -13,7 +13,6 @@ Group:         Applications/Engineering
 Source:        http://www-asim.lip6.fr/pub/alliance/distribution/5.0/%{name}-%{version}-%{snapshot}.tar.gz
 URL:           http://www-asim.lip6.fr/recherche/alliance/
 
-
 Source1:       alliance.fedora
 
 # Chitlesh's donated pictures to alliance
@@ -24,10 +23,16 @@ Source3:       alliance-tutorials-go-all-clean.sh
 Source4:       alliance-examples-go-all.sh
 Source5:       alliance-examples-go-all-clean.sh
 
+# 2014-07-01: Notified upstream via e-mail to alliance-users at asim.lip6.fr
+Patch0:        alliance-5.0-20090901-format-security.patch
+# 2014-07-01: From debian: debian/patches/10-fix-parser-extern.patch
+Patch1:        alliance-5.0-20090901-bison.patch
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libXt-devel byacc desktop-file-utils bison
 BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4
-BuildRequires: transfig ghostscript
+BuildRequires: transfig ghostscript tex(latex) tex(epsf.sty) tex(picinpar.sty)
+BuildRequires: tex(subfigure.sty) tex(wrapfig.sty)
 
 %if 0%{?rhel}
 BuildRequires: openmotif-devel
@@ -100,6 +105,8 @@ Documentation and tutorials for the Alliance VLSI CAD Sytem.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 %{__rm} -rf autom4te.cache
 
 %{__cp} -p %{SOURCE1} .
@@ -191,8 +198,6 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 %install
 
-%{__rm} -rf %{buildroot}
-
 %{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 
 # Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP.
@@ -292,15 +297,11 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 
-%clean
-%{__rm} -rf %{buildroot}
-
 #These headers are useful for the _usage_ of the binaries
 #without these headers some of the binaries will be broken by default
 
 
 %files
-%defattr(-,root,root,-)
 %doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %{prefix}/
 %{_datadir}/%{name}/
@@ -308,14 +309,12 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %files libs
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
 %{_datadir}/applications/*.desktop
 %config(noreplace) %{_sysconfdir}/profile.d/alc_env.*
 
 
 %files doc
-%defattr(-,root,root,-)
 %doc doc/html/
 %doc doc/design-flow
 %doc doc/pdf/*.pdf
@@ -332,6 +331,12 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Wed Jun 18 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 5.0-39.20090901snap
+- Add missing tex BRs (#913874, #991959, #1105945)
+- Fix FTBFS with -Werror=format-security
+- Fix FTBFS with latest bison
+- Remove unneeded macros
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0-38.20090901snap
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

More information about the scm-commits mailing list