Thu Sep 3 05:18:38 UTC 2009

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5769/F-11

Modified Files:
	.cvsignore alliance.spec import.log sources 
Removed Files:
	alliance-env.patch alliance-examples-adm2901.patch 
	alliance-examples-mipsR3000.patch alliance-examples.patch 
	alliance-perms.patch alliance-run.patch 
	alliance-tutorials-amd2901.patch 
	alliance-tutorials-place_n_route.patch 
	alliance-tutorials-simulation.patch 
	alliance-tutorials-start.patch 
	alliance-tutorials-synthesis.patch 
	alliance-xgra-xgrerror-ld.patch alliance-xgra.patch 
	dreal.desktop dreal.png graal.desktop graal.png xfsm.desktop 
	xfsm.png xgra.desktop xgra.png xpat.desktop xpat.png 
	xsch.desktop xsch.png xvpn.desktop xvpn.png 
Log Message:
20090901snap: upstream merged most of our patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- .cvsignore	28 Aug 2009 10:31:48 -0000	1.4
+++ .cvsignore	3 Sep 2009 05:18:34 -0000	1.5
@@ -1 +1 @@
-alliance-5.0-20090827.tar.gz
+alliance-5.0-20090901.tar.gz


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/alliance.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- alliance.spec	28 Aug 2009 14:51:37 -0000	1.23
+++ alliance.spec	3 Sep 2009 05:18:35 -0000	1.24
@@ -1,10 +1,10 @@
 %define        prefix    %{_libdir}/%{name}
-%define        snapshot  20090827
+%define        snapshot  20090901
 %define        _default_patch_fuzz  2
 
 Name:          alliance
 Version:       5.0
-Release:       30.%{snapshot}snap%{?dist}
+Release:       31.%{snapshot}snap%{?dist}
 Summary:       VLSI EDA System
 
 License:       GPLv2
@@ -13,51 +13,16 @@ 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/
 
-Patch0:        alliance-env.patch
-Patch1:        alliance-run.patch
-Patch2:        alliance-perms.patch
-
-# Improving autogeneration of documentation
-Patch3:        alliance-tutorials-place_n_route.patch
-Patch4:        alliance-tutorials-simulation.patch
-Patch5:        alliance-tutorials-start.patch
-Patch6:        alliance-tutorials-synthesis.patch
-Patch7:        alliance-tutorials-amd2901.patch
-
-# Improving examples
-Patch8:        alliance-examples.patch
-Patch9:        alliance-examples-adm2901.patch
-Patch10:       alliance-examples-mipsR3000.patch
-
-# upstream enhancements
-Patch11:       alliance-xgra.patch
-
-# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int'
-Patch12:       alliance-xgra-xgrerror-ld.patch
-
-Source1:       xsch.desktop
-Source2:       dreal.desktop
-Source3:       xpat.desktop
-Source4:       xfsm.desktop
-Source5:       xvpn.desktop
-Source6:       graal.desktop
-Source7:       xgra.desktop
 
-Source8:       alliance.fedora
+Source1:       alliance.fedora
 
 # Chitlesh's donated pictures to alliance
-Source9:       graal.png
-Source10:      dreal.png
-Source11:      xvpn.png
-Source12:      xfsm.png
-Source13:      xpat.png
-Source14:      xsch.png
-Source15:      xgra.png
-
-Source16:      alliance-tutorials-go-all.sh
-Source17:      alliance-tutorials-go-all-clean.sh
-Source18:      alliance-examples-go-all.sh
-Source19:      alliance-examples-go-all-clean.sh
+# included asfrom snapshot 20090901
+
+Source2:       alliance-tutorials-go-all.sh
+Source3:       alliance-tutorials-go-all-clean.sh
+Source4:       alliance-examples-go-all.sh
+Source5:       alliance-examples-go-all-clean.sh
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libXt-devel byacc desktop-file-utils bison
@@ -72,7 +37,7 @@ BuildRequires: lesstif-devel
 %endif
 
 Requires:      xorg-x11-fonts-misc
-# 442379
+# RHBZ 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
 %description
@@ -137,31 +102,17 @@ Documentation and tutorials for the Alli
 %setup -q
 %{__rm} -rf autom4te.cache
 
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
-sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop
+%{__cp} -p %{SOURCE1} .
+sed -i "s|ALLIANCE_TOP|%{prefix}|" distrib/*.desktop
 
 # removed useless copyrighted (by Cadence) lines from the examples
 # and even in alliance-run
 # https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html
 
-%patch11 -p1 -b .xgra-makefile.am
-%patch12 -p0 -b .xgra-long
-
-
-%patch0 -p0 -b .env
-%patch1 -p0 -b .run
-%patch2 -p0 -b .perms
-
-
 # ------------------------------------------------------------------------------
 # Description : 2008 March : TexLive introduction to Rawhide
 sed -i "s|tutorials||" documentation/Makefile.in
 sed -i "s|documentation/tutorials/Makefile||" configure*
-%patch3 -p1 -b .doc
-%patch4 -p1 -b .doc
-%patch5 -p1 -b .doc
-%patch6 -p1 -b .doc
-%patch7 -p0 -b .doc
 pushd documentation/tutorials
     # clean unneccessary files
     %{__rm} Makefile*
@@ -175,8 +126,8 @@ pushd documentation/tutorials
         %{__rm} -rf $folder
     done
     # Add automated scripts to tutorials
-    %{__install} -pm 755 %{SOURCE16} go-all.sh
-    %{__install} -pm 755 %{SOURCE17} go-all-clean.sh
+    %{__install} -pm 755 %{SOURCE2} go-all.sh
+    %{__install} -pm 755 %{SOURCE3} go-all-clean.sh
     # Fedora Electronic Lab self test for alliance
     #./go-all.sh 2>&1 | tee self-test-tutorials.log
     # clean temporary files
@@ -184,10 +135,6 @@ pushd documentation/tutorials
 popd
 # ------------------------------------------------------------------------------
 
-%patch8  -p0 -b .examples
-%patch9  -p1 -b .examples
-%patch10 -p1 -b .examples
-
 # fixing flex and bison update on rawhide
 sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h
 sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
@@ -211,10 +158,14 @@ done
 sed -i 's/\r//' mipsR3000/asm/*
 popd
 
-# Fix xgra build 
-sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile*
-sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile*
-
+find documentation/tutorials/ \
+    -name *.vbe  -o \
+    -name *.pat  -o \
+    -name *.vhdl -o \
+    -name *.vst  -o \
+    -name *.c \
+    -exec chmod 0644 {} ';'
+    
 %build
 
 export ALLIANCE_TOP=%{prefix}
@@ -225,7 +176,7 @@ export ALLIANCE_TOP=%{prefix}
            --includedir=%{prefix}/include \
            --libdir=%{prefix}/lib         \
            --bindir=%{prefix}/bin         \
-           --mandir=%{_datadir}/%{name}/man         #252941
+           --mandir=%{_datadir}/%{name}/man         # RHBZ 252941
 
 # disabling rpath
 sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool
@@ -244,7 +195,6 @@ sed -i -e 's! -shared ! -Wl,--as-needed\
 
 %{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 
-
 # Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP.
 pushd %{buildroot}%{_sysconfdir}/profile.d
   chmod 0644 alc_env.*
@@ -262,8 +212,8 @@ popd
 %{__rm} -rf %{buildroot}%{prefix}/examples/
 
 # Add automated scripts to examples
-%{__install} -pm 755 %{SOURCE18} alliance-examples/go-all.sh
-%{__install} -pm 755 %{SOURCE19} alliance-examples/go-all-clean.sh
+%{__install} -pm 755 %{SOURCE4} alliance-examples/go-all.sh
+%{__install} -pm 755 %{SOURCE5} alliance-examples/go-all-clean.sh
 
 pushd alliance-examples/
     # FEL self test for alliance
@@ -277,13 +227,13 @@ find %{buildroot} -name '*.la' -exec rm 
 
 # Adding icons for the menus
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-%{__cp} -p %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
+%{__cp} -p distrib/*.png \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 
 # desktop files with enhanced menu from electronics-menu now on Fedora
 # thanks Peter Brett
-for desktopfile in *.desktop; do
+for desktopfile in distrib/*.desktop; do
 desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/ \
   $desktopfile
@@ -327,6 +277,7 @@ sed -i "s|/bin/zsh|/bin/sh|" doc/allianc
 %{_fixperms} %{buildroot}/*
 
 
+
 %post
 /sbin/ldconfig
 source %{_sysconfdir}/profile.d/alc_env.sh
@@ -349,8 +300,8 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %files
-%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %defattr(-,root,root,-)
+%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %{prefix}/
 %{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/48x48/apps/*
@@ -381,6 +332,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Sep 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-31.20090901snap
+- updated to upstream's 20090901 snapshot
+- Removed all patches which are accepted by upstream
+
 * Thu Aug 27 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-30.20090827snap
 - updated to upstream's 20090828 snapshot
 - merged patches with upstream's snapshot: 64 bits stability patches and upstream enhancements


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	28 Aug 2009 10:31:49 -0000	1.4
+++ import.log	3 Sep 2009 05:18:36 -0000	1.5
@@ -2,3 +2,4 @@ alliance-5_0-21_20070718snap_fc9:HEAD:al
 alliance-5_0-24_20070718snap_fc10:HEAD:alliance-5.0-24.20070718snap.fc10.src.rpm:1233516213
 alliance-5_0-26_20070718snap_fc10:HEAD:alliance-5.0-26.20070718snap.fc10.src.rpm:1235508896
 alliance-5_0-30_20090827snap_fc11:F-11:alliance-5.0-30.20090827snap.fc11.src.rpm:1251455305
+alliance-5_0-31_20090901snap_fc11:F-11:alliance-5.0-31.20090901snap.fc11.src.rpm:1251954952


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Aug 2009 10:31:49 -0000	1.4
+++ sources	3 Sep 2009 05:18:36 -0000	1.5
@@ -1 +1 @@
-8591c98de3f24a76e81b5ecb4cf60f7d  alliance-5.0-20090827.tar.gz
+f3b692c4ea9e54c040280f660b3cf170  alliance-5.0-20090901.tar.gz


--- alliance-env.patch DELETED ---


--- alliance-examples-adm2901.patch DELETED ---


--- alliance-examples-mipsR3000.patch DELETED ---


--- alliance-examples.patch DELETED ---


--- alliance-perms.patch DELETED ---


--- alliance-run.patch DELETED ---


--- alliance-tutorials-amd2901.patch DELETED ---


--- alliance-tutorials-place_n_route.patch DELETED ---


--- alliance-tutorials-simulation.patch DELETED ---


--- alliance-tutorials-start.patch DELETED ---


--- alliance-tutorials-synthesis.patch DELETED ---


--- alliance-xgra-xgrerror-ld.patch DELETED ---


--- alliance-xgra.patch DELETED ---


--- dreal.desktop DELETED ---


--- graal.desktop DELETED ---


--- xfsm.desktop DELETED ---


--- xgra.desktop DELETED ---


--- xpat.desktop DELETED ---


--- xsch.desktop DELETED ---


--- xvpn.desktop DELETED ---


