rpms/geda-gnetlist/F-7 .cvsignore, 1.6, 1.7 geda-gnetlist.spec, 1.7, 1.8 sources, 1.6, 1.7

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20307/F-7

Modified Files:
	.cvsignore geda-gnetlist.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Mar 2007 07:40:54 -0000	1.6
+++ .cvsignore	27 Jun 2007 08:56:52 -0000	1.7
@@ -1 +1 @@
-geda-gnetlist-20070216.tar.gz
+geda-gnetlist-20070626.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/F-7/geda-gnetlist.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-gnetlist.spec	29 Mar 2007 07:40:54 -0000	1.7
+++ geda-gnetlist.spec	27 Jun 2007 08:56:52 -0000	1.8
@@ -1,7 +1,13 @@
-%define gedadocdir %{_datadir}/gEDA/docs
+%define gedadocdir %{_docdir}/gEDA/
+
+# For FC5
+# set FC-ver 5
+# FOR FC6 and onwards meanwhile sticking with guile-1.6 i.e compat-guile-16
+# set FC-ver 6
+#%define FC_ver 6
 
 Name:           geda-gnetlist
-Version:        20070216
+Version:        20070626
 Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
@@ -9,7 +15,7 @@
 License:        GPL
 
 URL:            http://www.geda.seul.org/tools/gnetlist/index.html
-Source:         ftp://ftp.geda.seul.org/pub/geda/devel/%{version}/%{name}-%{version}.tar.gz
+Source:         http://geda.seul.org/devel/1.0/1.0.1-%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgeda-devel, libstroke-devel, geda-symbols, groff
@@ -30,28 +36,34 @@
 %setup -q
 
 # use of guile-1.6
-cp -p configure configure.guile16
-sed -i "s|guile|guile-1.6|" configure
-sed -i "s|guile-1.6-config|guile-config-1.6|" configure src/create_proto
-sed -i "s|guile-1.6-tools|guile-tools-1.6|" configure
-sed -i "s|ac_cv_lib_guile-1.6|ac_cv_lib_guile|" configure
-sed -i "s|-lguile-1.6|-lguile16|" configure
-sed -i "s|guile-1.6version|guileversion|" configure
-sed -i "s|#include <libguile-1.6.h>|#include <libguile16.h>|" configure
-
+#%if "%{FC_ver}" > "5"
+#cp -p configure configure.guile16
+#sed -i "s|guile|guile-1.6|" configure
+#sed -i "s|guile-1.6-config|guile-config-1.6|" configure src/create_proto
+#sed -i "s|guile-1.6-tools|guile-tools-1.6|" configure
+#sed -i "s|ac_cv_lib_guile-1.6|ac_cv_lib_guile|" configure
+#sed -i "s|-lguile-1.6|-lguile16|" configure
+#sed -i "s|guile-1.6version|guileversion|" configure
+#sed -i "s|#include <libguile-1.6.h>|#include <libguile16.h>|" configure
 # v20061020 : file: include/libgeda.h
 # Keep timestamps for files not needed to be modified
-for f in `find . -name \*.h -or -name \*.c` ; do
-   if grep -q libguile $f ; then
-      sed -i.guile16 -e 's|libguile.h|libguile16.h|' $f
-   fi
-   if grep -q 'guile/' $f ; then
-      sed -i 's|guile/\(.*\)h|guile16/\1h|' $f
-   fi
-done
+#for f in `find . -name \*.h -or -name \*.c` ; do
+#   if grep -q libguile $f ; then
+#      sed -i.guile16 -e 's|libguile.h|libguile16.h|' $f
+#   fi
+#   if grep -q 'guile/' $f ; then
+#      sed -i 's|guile/\(.*\)h|guile16/\1h|' $f
+#   fi
+#done
+#%endif
 
 %build
 
+#%if "%{FC_ver}" > "5"
+#export GUILE_CFLAGS="-I%{_includedir}/libguile16 -I%{_includedir}/guile16"
+#export GUILE_LDFLAGS="-L%{_libdir}/guile16"
+#%endif
+
 %configure  --with-docdir=%{gedadocdir}
 %{__make} %{?_smp_mflags}
 
@@ -69,6 +81,9 @@
 %{__rm} -f  examples/vams/vhdl/{basic-vhdl,new-vhdl}/Makefile*
 chmod 644 examples/vams/vhdl/basic-vhdl/*.vhdl
 
+install -d %{buildroot}%{gedadocdir}/examples
+install -p -m 644 examples/*.sch %{buildroot}%{gedadocdir}/examples
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -96,8 +111,21 @@
 %{gedadocdir}/vams
 %{gedadocdir}/readmes/*
 %{gedadocdir}/man/gnetlist.html
+%{gedadocdir}/examples/*
 
 %Changelog
+* Tue Jun 27 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070626-1
+- new upstream release
+
+* Thu Jun 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070526-1
+- new upstream release
+
+* Tue Apr 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070216-3
+- rebuild for fc6 and devel
+
+* Tue Apr 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070216-2
+- new upstream release on 2007 02 16 support for FC-5
+
 * Wed Mar 28 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070216-1
 - new upstream release on 2007 02 16
 - dropped patch geda-gnetlist-20061020-backend-list.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Mar 2007 07:40:54 -0000	1.6
+++ sources	27 Jun 2007 08:56:52 -0000	1.7
@@ -1 +1 @@
-bb16a76e8bf2d410b48a9eb0677202eb  geda-gnetlist-20070216.tar.gz
+80f693a88f3365dba9182e804fc7a315  geda-gnetlist-20070626.tar.gz