rpms/alliance/devel alliance.spec,1.1,1.2

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/alliance/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019/devel

Modified Files:
	alliance.spec 
Log Message:



Index: alliance.spec
===================================================================
RCS file: /cvs/extras/rpms/alliance/devel/alliance.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alliance.spec	13 Aug 2007 21:02:23 -0000	1.1
+++ alliance.spec	16 Aug 2007 12:19:36 -0000	1.2
@@ -3,10 +3,10 @@
 
 Name:          alliance
 Version:       5.0
-Release:       7.%{snapshot}snap%{?dist}
+Release:       8.%{snapshot}snap%{?dist}
 Summary:       Alliance VLSI CAD Sytem
 
-License:       GPL
+License:       GPLv2
 Group:         Applications/Engineering
 
 Source:        http://www-asim.lip6.fr/pub/alliance/distribution/5.0/%{name}-%{version}-%{snapshot}.tar.gz
@@ -122,7 +122,7 @@
 popd
 
 #conflicts with man-pages and is a duplicate of log.1.gz
-%patch5 -p0 -b .duplicate
+#%patch5 -p0 -b .duplicate
 
 
 # removing useless copyrighted (by Cadence) lines from the examples
@@ -155,7 +155,8 @@
            --disable-static               \
            --includedir=%{prefix}/include \
            --libdir=%{prefix}/lib         \
-           --bindir=%{prefix}/bin
+           --bindir=%{prefix}/bin         \
+           --mandir=%{prefix}/man         #252941
 
 # disabling rpath
 sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool
@@ -253,8 +254,6 @@
 %{__rm} -f doc/pdf/attila.pdf
 
 
-
-
 %post
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -289,7 +288,7 @@
 %config %{_sysconfdir}/%{name}/*.par
 %config %{_sysconfdir}/ld.so.conf.d/*
 %{_datadir}/icons/hicolor/48x48/apps/*
-%{_mandir}/man?/*
+#%{_mandir}/man?/*
 %{_datadir}/applications/fedora-*.desktop
 %{_sysconfdir}/profile.d/alc_env.*
 
@@ -312,6 +311,10 @@
 
 
 %changelog
+* Thu Aug 16 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-8.20070718snap
+- fixing conflicts with QuantLib-doc package (#252941)
+- update license macro to comply with new guidelines)
+
 * Sun Aug 12 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-7.20070718snap
 - moved Architecture independent files to %%{_datadir}/%%{name}
 - Uses verbs in the comments line for desktop files