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

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Mar 2007 07:36:21 -0000	1.5
+++ .cvsignore	27 Jun 2007 08:39:30 -0000	1.6
@@ -1 +1 @@
-geda-gattrib-20070216.tar.gz
+geda-gattrib-20070626.tar.gz


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/geda-gattrib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- geda-gattrib.spec	29 Mar 2007 07:36:21 -0000	1.6
+++ geda-gattrib.spec	27 Jun 2007 08:39:30 -0000	1.7
@@ -1,5 +1,11 @@
+# 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-gattrib
-Version:        20070216
+Version:        20070626
 Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
@@ -7,7 +13,7 @@
 License:        GPL
 
 URL:            http://www.geda.seul.org/tools/gattrib/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
 Source1:        gattrib.desktop
 # Source 2: from the geda package
 Source2:        gattrib.xpm
@@ -31,28 +37,33 @@
 %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"
+
+#%if "%{FC_ver}" > "5"
+#export GUILE_CFLAGS="-I%{_includedir}/libguile16 -I%{_includedir}/guile16"
+#export GUILE_LDFLAGS="-L%{_libdir}/guile16"
+#%endif
 
 
 %configure
@@ -82,15 +93,16 @@
 %{__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,-)
@@ -102,6 +114,18 @@
 %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm
 
 %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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Mar 2007 07:36:21 -0000	1.5
+++ sources	27 Jun 2007 08:39:30 -0000	1.6
@@ -1 +1 @@
-3134fa7998a100a260acff1e2d4582f8  geda-gattrib-20070216.tar.gz
+f6222fb7e6d150bdb799f32bb53cbf8d  geda-gattrib-20070626.tar.gz