From 2b4567f77c9948a2427ce3b3751ac4e20dd62e08 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 12:05:51 +0000 Subject: [PATCH 1/9] Initialize branch F-9 for alliance --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From cb32ab2a57617138564d87484d16b142fc89ab0c Mon Sep 17 00:00:00 2001 From: Thibault North Date: Mon, 26 May 2008 10:59:14 +0000 Subject: [PATCH 2/9] Added in electronics menu --- alliance.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/alliance.spec b/alliance.spec index 3c81939..c5c4c6e 100644 --- a/alliance.spec +++ b/alliance.spec @@ -3,7 +3,7 @@ Name: alliance Version: 5.0 -Release: 13.%{snapshot}snap%{?dist} +Release: 14.%{snapshot}snap%{?dist} Summary: Alliance VLSI CAD Sytem License: GPLv2 @@ -200,6 +200,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' for desktopfile in *.desktop; do desktop-file-install --vendor fedora \ --add-category Engineering \ + --add-category Electronics \ --remove-category Science \ --dir %{buildroot}%{_datadir}/applications/ \ $desktopfile @@ -289,6 +290,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Tue May 20 2008 Thibault North < tnorth [AT] fedoraproject DOT org> - 5.0-14.20070718snap +- Add to Electronics Menu + * Fri Mar 21 2008 Chitlesh Goorah - 5.0-13.20070718snap - Requiring new FEL menu structure - Fixing previous desktop files From 282fad6bf950527cade54c7c0321fa505fd5cf2d Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Mon, 26 May 2008 21:03:35 +0000 Subject: [PATCH 3/9] bugfix --- alliance-env.patch | 159 +++++++++++++-------------------------------- alliance.spec | 11 +++- 2 files changed, 54 insertions(+), 116 deletions(-) diff --git a/alliance-env.patch b/alliance-env.patch index 2ddf663..5573c9e 100644 --- a/alliance-env.patch +++ b/alliance-env.patch @@ -1,131 +1,64 @@ -diff -Naur distrib/etc/alc_env.csh.in etc/alc_env.csh.in ---- distrib/etc/alc_env.csh.in 2006-10-05 12:09:24.000000000 +0200 -+++ etc/alc_env.csh.in 2007-08-18 13:48:55.000000000 +0200 -@@ -1,4 +1,4 @@ --# -*- Mode: Shell-script -*- -+# -*- Mode: Shell-script -*- - # -*- vim: set filetype=csh: -*- - # ,,, - # (o o) -@@ -28,17 +28,17 @@ - setenv MBK_OUT_LO vst - setenv MBK_IN_PH ap - setenv MBK_OUT_PH ap -- -+ - setenv MBK_WORK_LIB . - setenv MBK_CATAL_NAME CATAL -- -+ - setenv MBK_SCALE_X 100 -- -+ - setenv VH_MAXERR 10 - setenv VH_BEHSFX vbe - setenv VH_PATSFX pat - setenv VH_DLYSFX dly -- -+ - setenv MBK_CATA_LIB ".:${ALLIANCE_TOP}/cells/sxlib" - setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/dp_sxlib" - setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/rflib" -@@ -48,42 +48,29 @@ - setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/pxlib" - setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/padlib" - setenv MBK_TARGET_LIB "${ALLIANCE_TOP}/cells/sxlib" -- setenv MBK_C4_LIB ./cellsC4 -- -+ setenv MBK_C4_LIB ./cellsC4 -+ - setenv MBK_VDD vdd - setenv MBK_VSS vss -- -+ - setenv XPAT_PARAM_NAME "${ALLIANCE_TOP}/etc/xpat.par" - setenv XFSM_PARAM_NAME "${ALLIANCE_TOP}/etc/xfsm.par" - setenv XSCH_PARAM_NAME "${ALLIANCE_TOP}/etc/xsch.par" -- -+ - setenv RDS_IN cif - setenv RDS_OUT cif -- -+ - setenv DREAL_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.dreal" - setenv GRAAL_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.graal" - setenv GENVIEW_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.genview" -- -+ - setenv RDS_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.rds" - setenv ELP_TECHNO_NAME "${ALLIANCE_TOP}/etc/prol.elp" - - +--- distrib/etc/alc_env.csh.in 2006-10-05 12:09:25.000000000 +0200 ++++ etc/alc_env.csh.in 2008-05-26 22:37:15.000000000 +0200 +@@ -70,20 +70,23 @@ + # System environment variables. -- if ( $?PATH ) then + if ( $?PATH ) then - setenv PATH "${ALLIANCE_TOP}/bin:$PATH" -- else -- setenv PATH "${ALLIANCE_TOP}/bin" -- endif -- --# Only needed on Solaris (included in /etc/ld.so.conf under Linux). -- if ( $?LD_LIBRARY_PATH ) then ++ setenv PATH "$PATH:${ALLIANCE_TOP}/bin:" + else + setenv PATH "${ALLIANCE_TOP}/bin" + endif + + # Only needed on Solaris (included in /etc/ld.so.conf under Linux). + if ( $?LD_LIBRARY_PATH ) then - setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH" -- else -- setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib" -- endif -- ++ setenv LD_LIBRARY_PATH "$LD_LIBRARY_PATH:${ALLIANCE_TOP}/lib:" + else + setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib" + endif + - if ( $?MANPATH ) then - setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}" -- else -- setenv MANPATH "${ALLIANCE_TOP}/man" -- endif -+ setenv PATH "${PATH}:${ALLIANCE_TOP}/bin" ++ if ($?MANPATH) then + setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man" + else +- setenv MANPATH "${ALLIANCE_TOP}/man" ++ setenv MANPATH "${ALLIANCE_TOP}/man" + endif + +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found. + setenv MBK_SPI_MODEL "${ALLIANCE_TOP}/etc/spimodel.cfg" -diff -Naur distrib/etc/alc_env.sh.in etc/alc_env.sh.in ---- distrib/etc/alc_env.sh.in 2006-10-05 12:09:24.000000000 +0200 -+++ etc/alc_env.sh.in 2007-08-18 13:47:04.000000000 +0200 -@@ -1,4 +1,4 @@ --# -*- Mode: Shell-script -*- -+# -*- Mode: Shell-script -*- - # -*- vim: set filetype=sh: -*- - # ,,, - # (o o) -@@ -24,7 +24,7 @@ - - # Alliance environment variables. - MBK_IN_LO=vst; export MBK_IN_LO -- MBK_OUT_LO=vst; export MBK_OUT_LO -+ MBK_OUT_LO=vst; export MBK_OUT_LO - MBK_IN_PH=ap; export MBK_IN_PH - MBK_OUT_PH=ap; export MBK_OUT_PH - -@@ -70,20 +70,8 @@ - - +--- distrib/etc/alc_env.sh.in 2006-10-05 12:09:25.000000000 +0200 ++++ etc/alc_env.sh.in 2008-05-26 22:41:30.000000000 +0200 +@@ -70,20 +70,23 @@ + + # System environment variables. - PATH=$ALLIANCE_TOP/bin:$PATH -- export PATH -+ export PATH=$PATH:$ALLIANCE_TOP/bin -+ export MANPATH=$MANPATH:$ALLIANCE_TOP/man - --# Only needed on Solaris (included in /etc/ld.so.conf under Linux). -- if [ -z "${LD_LIBRARY_PATH}" ]; then -- LD_LIBRARY_PATH=$ALLIANCE_TOP/lib -- else ++ PATH=$PATH:$ALLIANCE_TOP/bin: + export PATH + + # Only needed on Solaris (included in /etc/ld.so.conf under Linux). + if [ -z "${LD_LIBRARY_PATH}" ]; then + LD_LIBRARY_PATH=$ALLIANCE_TOP/lib + else - LD_LIBRARY_PATH=$ALLIANCE_TOP/lib:$LD_LIBRARY_PATH -- fi -- export LD_LIBRARY_PATH -- -- if [ -z "${MANPATH}" ]; then -- MANPATH=$ALLIANCE_TOP/man -- else ++ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib: + fi + export LD_LIBRARY_PATH + + if [ -z "${MANPATH}" ]; then + MANPATH=$ALLIANCE_TOP/man + else - MANPATH=$ALLIANCE_TOP/man:$MANPATH -- fi -- export MANPATH ++ MANPATH=$MANPATH:$ALLIANCE_TOP/man: + fi + export MANPATH ++ +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found. + MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg; export MBK_SPI_MODEL + diff -Naur distrib/etc/Makefile.am etc/Makefile.am --- distrib/etc/Makefile.am 2002-06-25 16:09:38.000000000 +0200 +++ etc/Makefile.am 2007-08-18 13:58:38.000000000 +0200 diff --git a/alliance.spec b/alliance.spec index c5c4c6e..8a88285 100644 --- a/alliance.spec +++ b/alliance.spec @@ -3,7 +3,7 @@ Name: alliance Version: 5.0 -Release: 14.%{snapshot}snap%{?dist} +Release: 15.%{snapshot}snap%{?dist} Summary: Alliance VLSI CAD Sytem License: GPLv2 @@ -43,7 +43,8 @@ BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4 BuildRequires: transfig ghostscript Requires: %{name}-libs = %{version}-%{release} - +# 442379 +Requires(post): %{name}-libs = %{version}-%{release} %description Alliance is a complete set of free CAD tools and portable libraries for @@ -200,7 +201,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' for desktopfile in *.desktop; do desktop-file-install --vendor fedora \ --add-category Engineering \ - --add-category Electronics \ + --add-category Electronics \ --remove-category Science \ --dir %{buildroot}%{_datadir}/applications/ \ $desktopfile @@ -290,6 +291,10 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Mon May 26 2008 Chitlesh Goorah - 5.0-15.20070718snap +- Bugfix: error in postinstall scriptlet: /etc/profile.d/alc_env.sh not found #442379 +- Bugfix: /etc/profile.d/alc_env.csh assumes MANPATH is preset #440083 + * Tue May 20 2008 Thibault North < tnorth [AT] fedoraproject DOT org> - 5.0-14.20070718snap - Add to Electronics Menu From b3914220572f21206196d96544a05154ca9332cc Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Fri, 30 May 2008 17:38:18 +0000 Subject: [PATCH 4/9] bug fix --- alliance-env.patch | 4 ++-- alliance.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alliance-env.patch b/alliance-env.patch index 5573c9e..e71751b 100644 --- a/alliance-env.patch +++ b/alliance-env.patch @@ -5,7 +5,7 @@ # System environment variables. if ( $?PATH ) then - setenv PATH "${ALLIANCE_TOP}/bin:$PATH" -+ setenv PATH "$PATH:${ALLIANCE_TOP}/bin:" ++ setenv PATH "${PATH}:${ALLIANCE_TOP}/bin:" else setenv PATH "${ALLIANCE_TOP}/bin" endif @@ -13,7 +13,7 @@ # Only needed on Solaris (included in /etc/ld.so.conf under Linux). if ( $?LD_LIBRARY_PATH ) then - setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH" -+ setenv LD_LIBRARY_PATH "$LD_LIBRARY_PATH:${ALLIANCE_TOP}/lib:" ++ setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib:" else setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib" endif diff --git a/alliance.spec b/alliance.spec index 8a88285..e3ec7d8 100644 --- a/alliance.spec +++ b/alliance.spec @@ -3,7 +3,7 @@ Name: alliance Version: 5.0 -Release: 15.%{snapshot}snap%{?dist} +Release: 16.%{snapshot}snap%{?dist} Summary: Alliance VLSI CAD Sytem License: GPLv2 @@ -291,6 +291,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Fri May 30 2008 Chitlesh Goorah - 5.0-16.20070718snap +- Bugfix /etc/profile.d/alc_env.csh problem #449062 #448480 + * Mon May 26 2008 Chitlesh Goorah - 5.0-15.20070718snap - Bugfix: error in postinstall scriptlet: /etc/profile.d/alc_env.sh not found #442379 - Bugfix: /etc/profile.d/alc_env.csh assumes MANPATH is preset #440083 From b77a2602b5ef8e4171adc28bb6707ad8f474c3f0 Mon Sep 17 00:00:00 2001 From: Aanjhan Ranganathan Date: Sun, 10 Aug 2008 07:19:33 +0000 Subject: [PATCH 5/9] rebuild using lesstif --- alliance.spec | 10 +++++++++- import.log | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 import.log diff --git a/alliance.spec b/alliance.spec index e3ec7d8..0c86418 100644 --- a/alliance.spec +++ b/alliance.spec @@ -1,9 +1,10 @@ %define prefix %{_libdir}/%{name} %define snapshot 20070718 +%define _default_patch_fuzz 2 Name: alliance Version: 5.0 -Release: 16.%{snapshot}snap%{?dist} +Release: 20.%{snapshot}snap%{?dist} Summary: Alliance VLSI CAD Sytem License: GPLv2 @@ -291,6 +292,13 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Mon Aug 04 2008 Aanjhan Ranganathan - 5.0-20.20070718snap +- Bumped release version to match changelog + +* Fri Aug 01 2008 Aanjhan Ranganathan - 5.0-16.20070718snap +- Rebuild using latest lesstif-devel. For #368441 +- Temporarily set fuzz parameter of patch system to be 2 + * Fri May 30 2008 Chitlesh Goorah - 5.0-16.20070718snap - Bugfix /etc/profile.d/alc_env.csh problem #449062 #448480 diff --git a/import.log b/import.log new file mode 100644 index 0000000..ce74b42 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +alliance-5_0-20_20070718snap_fc10:F-9:alliance-5.0-20.20070718snap.fc10.src.rpm:1218332940 From c5d36ff9b2386ff77df545c7255a758068b144de Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Mon, 15 Sep 2008 16:29:11 +0000 Subject: [PATCH 6/9] bug fix 2 --- alliance-env.patch | 15 ++++++++------- alliance.spec | 8 ++++++-- import.log | 1 + 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/alliance-env.patch b/alliance-env.patch index e71751b..2281a58 100644 --- a/alliance-env.patch +++ b/alliance-env.patch @@ -5,7 +5,7 @@ # System environment variables. if ( $?PATH ) then - setenv PATH "${ALLIANCE_TOP}/bin:$PATH" -+ setenv PATH "${PATH}:${ALLIANCE_TOP}/bin:" ++ setenv PATH "${PATH}:${ALLIANCE_TOP}/bin" else setenv PATH "${ALLIANCE_TOP}/bin" endif @@ -13,7 +13,7 @@ # Only needed on Solaris (included in /etc/ld.so.conf under Linux). if ( $?LD_LIBRARY_PATH ) then - setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH" -+ setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib:" ++ setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib" else setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib" endif @@ -24,7 +24,7 @@ + setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man" else - setenv MANPATH "${ALLIANCE_TOP}/man" -+ setenv MANPATH "${ALLIANCE_TOP}/man" ++ setenv MANPATH ":${ALLIANCE_TOP}/man" endif + +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found. @@ -36,7 +36,7 @@ # System environment variables. - PATH=$ALLIANCE_TOP/bin:$PATH -+ PATH=$PATH:$ALLIANCE_TOP/bin: ++ PATH=$PATH:$ALLIANCE_TOP/bin export PATH # Only needed on Solaris (included in /etc/ld.so.conf under Linux). @@ -44,15 +44,16 @@ LD_LIBRARY_PATH=$ALLIANCE_TOP/lib else - LD_LIBRARY_PATH=$ALLIANCE_TOP/lib:$LD_LIBRARY_PATH -+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib: ++ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib fi export LD_LIBRARY_PATH if [ -z "${MANPATH}" ]; then - MANPATH=$ALLIANCE_TOP/man +- MANPATH=$ALLIANCE_TOP/man ++ MANPATH=:$ALLIANCE_TOP/man else - MANPATH=$ALLIANCE_TOP/man:$MANPATH -+ MANPATH=$MANPATH:$ALLIANCE_TOP/man: ++ MANPATH=$MANPATH:$ALLIANCE_TOP/man fi export MANPATH + diff --git a/alliance.spec b/alliance.spec index 0c86418..c8975c2 100644 --- a/alliance.spec +++ b/alliance.spec @@ -4,7 +4,7 @@ Name: alliance Version: 5.0 -Release: 20.%{snapshot}snap%{?dist} +Release: 21.%{snapshot}snap%{?dist} Summary: Alliance VLSI CAD Sytem License: GPLv2 @@ -43,7 +43,7 @@ BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4 BuildRequires: transfig ghostscript -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} # 442379 Requires(post): %{name}-libs = %{version}-%{release} @@ -292,6 +292,10 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Mon Sep 15 2008 Chitlesh Goorah - 5.0-21.20070718snap +- Bugfix : Alliance incorrectly mungs your path and adds the cwd to the path #459336 +- Bugfix : Latest alc_env fixes broken system man path #452645 + * Mon Aug 04 2008 Aanjhan Ranganathan - 5.0-20.20070718snap - Bumped release version to match changelog diff --git a/import.log b/import.log index ce74b42..5877486 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ alliance-5_0-20_20070718snap_fc10:F-9:alliance-5.0-20.20070718snap.fc10.src.rpm:1218332940 +alliance-5_0-21_20070718snap_fc9:F-9:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496105 From d0cbb792df8345c82e07f24fd72f69d7186325fd Mon Sep 17 00:00:00 2001 From: Chitlesh GOORAH Date: Sun, 1 Feb 2009 19:12:02 +0000 Subject: [PATCH 7/9] generic bug fix --- alliance-generic.patch | 20 ++++++++++++++++++++ alliance.spec | 17 ++++++++++++++--- import.log | 1 + 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 alliance-generic.patch diff --git a/alliance-generic.patch b/alliance-generic.patch new file mode 100644 index 0000000..24591b9 --- /dev/null +++ b/alliance-generic.patch @@ -0,0 +1,20 @@ +--- vbl/src/vbl_bcomp_y.y 2004-09-03 21:11:18.000000000 +0200 ++++ vbl_bcomp_y.y 2009-02-01 15:39:12.000000000 +0100 +@@ -4645,7 +4645,7 @@ + + if ( ! $1.DYNAMIC ) + { +- VexTarget = vbl_dynamicvexatom( $1.NAME, $1.LEFT, $1.RIGHT, Dynamic ); ++ VexTarget = vbl_dynamicvexatom( $1.NAME, $1.LEFT, $1.RIGHT, 0 ); + } + else + { +@@ -4903,7 +4903,7 @@ + + if ( ! $5.DYNAMIC ) + { +- VexTarget = vbl_dynamicvexatom( $5.NAME, $5.LEFT, $5.RIGHT, Dynamic ); ++ VexTarget = vbl_dynamicvexatom( $5.NAME, $5.LEFT, $5.RIGHT, 0 ); + } + else + { diff --git a/alliance.spec b/alliance.spec index c8975c2..994b2bc 100644 --- a/alliance.spec +++ b/alliance.spec @@ -4,8 +4,8 @@ Name: alliance Version: 5.0 -Release: 21.%{snapshot}snap%{?dist} -Summary: Alliance VLSI CAD Sytem +Release: 24.%{snapshot}snap%{?dist} +Summary: VLSI EDA System License: GPLv2 Group: Applications/Engineering @@ -18,6 +18,7 @@ Patch1: alliance-examples.patch Patch2: alliance-run.patch Patch3: alliance-perms.patch Patch4: alliance-gcc43.patch +Patch5: alliance-generic.patch Source1: xsch.desktop Source2: dreal.desktop @@ -43,7 +44,7 @@ BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4 BuildRequires: transfig ghostscript -Requires: %{name}-libs = %{version}-%{release} +Requires: xorg-x11-fonts-misc # 442379 Requires(post): %{name}-libs = %{version}-%{release} @@ -127,6 +128,7 @@ tar -xvf %{SOURCE14} %patch4 -p1 -b .include +%patch5 -p0 -b .generic # make sure the man pages are UTF-8... for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \ @@ -292,6 +294,15 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Sun Feb 01 2009 Chitlesh Goorah - 5.0-24.20070718snap +- Improved VHDL generic implementation + +* Mon Nov 10 2008 Chitlesh Goorah - 5.0-23.20070718snap +- Added Requires xorg-x11-fonts-misc to fix launch crash + +* Mon Nov 3 2008 Chitlesh Goorah - 5.0-22.20070718snap +- rebuild for F10 + * Mon Sep 15 2008 Chitlesh Goorah - 5.0-21.20070718snap - Bugfix : Alliance incorrectly mungs your path and adds the cwd to the path #459336 - Bugfix : Latest alc_env fixes broken system man path #452645 diff --git a/import.log b/import.log index 5877486..1e1e15d 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ alliance-5_0-20_20070718snap_fc10:F-9:alliance-5.0-20.20070718snap.fc10.src.rpm:1218332940 alliance-5_0-21_20070718snap_fc9:F-9:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496105 +alliance-5_0-24_20070718snap_fc10:F-9:alliance-5.0-24.20070718snap.fc10.src.rpm:1233515432 From 96bb8454404f94282415c5b1e844f9f3aee617d8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:31 +0000 Subject: [PATCH 8/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7633618..7e1f9df 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alliance -# $Id$ +# $Id: Makefile,v 1.1 2007/08/13 19:36:39 kevin Exp $ NAME := alliance SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From edf3f33ac6c4c3f67c038e2c391e490c474c9962 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:43:36 +0000 Subject: [PATCH 9/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 3 --- 4 files changed, 25 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7e1f9df..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alliance -# $Id: Makefile,v 1.1 2007/08/13 19:36:39 kevin Exp $ -NAME := alliance -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 diff --git a/import.log b/import.log deleted file mode 100644 index 1e1e15d..0000000 --- a/import.log +++ /dev/null @@ -1,3 +0,0 @@ -alliance-5_0-20_20070718snap_fc10:F-9:alliance-5.0-20.20070718snap.fc10.src.rpm:1218332940 -alliance-5_0-21_20070718snap_fc9:F-9:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496105 -alliance-5_0-24_20070718snap_fc10:F-9:alliance-5.0-24.20070718snap.fc10.src.rpm:1233515432