rpms/geda-utils/FC-6 .cvsignore, 1.5, 1.6 geda-utils.spec, 1.5, 1.6 sources, 1.5, 1.6

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28133/FC-6

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Mar 2007 07:48:42 -0000	1.5
+++ .cvsignore	27 Jun 2007 09:03:35 -0000	1.6
@@ -1 +1 @@
-geda-utils-20070216.tar.gz
+geda-utils-20070626.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/geda-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geda-utils.spec	29 Mar 2007 07:48:42 -0000	1.5
+++ geda-utils.spec	27 Jun 2007 09:03:35 -0000	1.6
@@ -1,5 +1,9 @@
+# Set the fedora version for the BR: perl-libs
+# FC_ver may take the value 5, 6, 7 or 8
+%define     FC_ver  6
+
 Name:           geda-utils
-Version:        20070216
+Version:        20070626
 Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
@@ -7,13 +11,17 @@
 License:        GPL
 
 URL:            http://www.geda.seul.org/tools/utils/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
 Requires:       geda-symbols
 
+%if "%{?FC_ver}" > "6"
+BuildRequires: perl-libs
+%endif
+
 %description
 Several utilities for the gEDA project.
 
@@ -21,49 +29,58 @@
 %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-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
-export GUILE_CFLAGS="-I%{_includedir}/libguile16 -I%{_includedir}/guile16"
-export GUILE_LDFLAGS="-L%{_libdir}/guile16"
 
-%configure --with-docdir=%{_datadir}/gEDA/docs
+#%if "%{FC_ver}" > "5"
+#export GUILE_CFLAGS="-I%{_includedir}/libguile16 -I%{_includedir}/guile16"
+#export GUILE_LDFLAGS="-L%{_libdir}/guile16"
+#%endif
+
+%configure --with-docdir=%{_docdir}/gEDA/
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
+
+
 %clean
 %{__rm} -rf %{buildroot}
 
 # geda-symbols is the Owner of the following directories
+#%dir %{_datadir}/doc/gEDA
+#%dir %{_datadir}/doc/gEDA/readmes
+#%dir %{_datadir}/doc/gEDA/man
+#%dir %{_datadir}/doc/gEDA/examples
 #%dir %{_datadir}/gEDA/bitmap
-#%dir %{_datadir}/gEDA/docs
-#%dir %{_datadir}/gEDA/docs/readmes
-#%dir %{_datadir}/gEDA/docs/man
-#%dir %{_datadir}/gEDA/examples
 #%dir %{_datadir}/gEDA/scheme
 
 # libgeda is the Owner of the following directories
 #%dir %{_datadir}/gEDA
+#%dir %{_datadir}/doc/gEDA
+
 
 %files
 %defattr(-,root,root,-)
@@ -77,7 +94,7 @@
 %{_bindir}/sarlacc_sym
 %{_bindir}/gschupdate
 %{_bindir}/gsymfix.pl
-%{_bindir}/gschemdoc
+%{_bindir}/pcb_backannotate
 %{_bindir}/gschlas
 %{_bindir}/olib
 %{_bindir}/refdes_renum
@@ -88,11 +105,17 @@
 %{_bindir}/gnet_hier_verilog.sh
 %{_datadir}/gEDA/system-gschlasrc
 %{_mandir}/man1/grenum.1.gz
-%{_datadir}/gEDA/docs/readmes/README*
+%{_docdir}/gEDA/readmes/README*
 
 %Changelog
-* Wed Mar 28 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070216-1
-- new upstream release on 2007 02 16
+* 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-2
+- new upstream release on 2007 02 16 support for FC-5
 
 * Mon Jan 08 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-2
 - rebuilt under compat-guile-16


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Mar 2007 07:48:42 -0000	1.5
+++ sources	27 Jun 2007 09:03:35 -0000	1.6
@@ -1 +1 @@
-82ae3d3547eb45f15cca7e9c5a8b9edc  geda-utils-20070216.tar.gz
+4701412ae159e2e87bab635e2ad787a6  geda-utils-20070626.tar.gz