rpms/geda-gschem/FC-6 .cvsignore, 1.5, 1.6 geda-gschem.spec, 1.7, 1.8 sources, 1.5, 1.6
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Fri Jun 15 12:30:06 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/geda-gschem/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11363/FC-6
Modified Files:
.cvsignore geda-gschem.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 29 Mar 2007 07:21:23 -0000 1.5
+++ .cvsignore 15 Jun 2007 12:29:31 -0000 1.6
@@ -1 +1 @@
-geda-gschem-20070216.tar.gz
+geda-gschem-20070526.tar.gz
Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/geda-gschem.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geda-gschem.spec 29 Mar 2007 07:21:23 -0000 1.7
+++ geda-gschem.spec 15 Jun 2007 12:29:31 -0000 1.8
@@ -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-gschem
-Version: 20070216
+Version: 20070526
Release: 1%{?dist}
Summary: Electronics schematics editor
@@ -24,42 +30,47 @@
%prep
%setup -q
+#%if "%{FC_ver}" > "5"
# 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
+#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}
-install -d %{buildroot}%{_datadir}/gEDA/examples
+install -d %{buildroot}%{_docdir}/gEDA/examples
install -d %{buildroot}%{_datadir}/gEDA/scheme
-install -p -m 644 examples/*.sch %{buildroot}%{_datadir}/gEDA/examples
-install -p -m 644 examples/README.* %{buildroot}%{_datadir}/gEDA/examples
+install -p -m 644 examples/*.sch %{buildroot}%{_docdir}/gEDA/examples
+install -p -m 644 examples/README.* %{buildroot}%{_docdir}/gEDA/examples
install -p -m 644 scheme/*.scm %{buildroot}%{_datadir}/gEDA/scheme
desktop-file-install --vendor "" \
@@ -100,20 +111,23 @@
%{__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 -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS BUGS ChangeLog COPYING README TODO VOCABULARY
%{_bindir}/gschem
+%{_bindir}/gschemdoc
%{_datadir}/gEDA/scheme/auto-place-attribs.scm
%{_datadir}/gEDA/scheme/image.scm
%{_datadir}/gEDA/scheme/pcb.scm
@@ -123,20 +137,20 @@
%{_datadir}/gEDA/scheme/gschem.scm
%{_datadir}/gEDA/scheme/list-keys.scm
%{_datadir}/gEDA/scheme/print-NB-attribs.scm
-%{_datadir}/gEDA/examples/IEC417.sch
-%{_datadir}/gEDA/examples/README.agile
-%{_datadir}/gEDA/examples/adders_1.sch
-%{_datadir}/gEDA/examples/cmos-invert.sch
-%{_datadir}/gEDA/examples/cmos-nand.sch
-%{_datadir}/gEDA/examples/cmos-nor.sch
-%{_datadir}/gEDA/examples/filter_1.sch
-%{_datadir}/gEDA/examples/flipflop_1.sch
-%{_datadir}/gEDA/examples/gEDA_Flow.sch
-%{_datadir}/gEDA/examples/grey_counter_1.sch
-%{_datadir}/gEDA/examples/logo_1.sch
-%{_datadir}/gEDA/examples/multiplex_1.sch
-%{_datadir}/gEDA/examples/stack_1.sch
-%{_datadir}/gEDA/examples/drawing_primitives.sch
+%{_docdir}/gEDA/examples/IEC417.sch
+%{_docdir}/gEDA/examples/README.agile
+%{_docdir}/gEDA/examples/adders_1.sch
+%{_docdir}/gEDA/examples/cmos-invert.sch
+%{_docdir}/gEDA/examples/cmos-nand.sch
+%{_docdir}/gEDA/examples/cmos-nor.sch
+%{_docdir}/gEDA/examples/filter_1.sch
+%{_docdir}/gEDA/examples/flipflop_1.sch
+%{_docdir}/gEDA/examples/gEDA_Flow.sch
+%{_docdir}/gEDA/examples/grey_counter_1.sch
+%{_docdir}/gEDA/examples/logo_1.sch
+%{_docdir}/gEDA/examples/multiplex_1.sch
+%{_docdir}/gEDA/examples/stack_1.sch
+%{_docdir}/gEDA/examples/drawing_primitives.sch
%{_datadir}/gEDA/bitmap/gschem-*
%{_datadir}/gEDA/system-gschemrc
%{_datadir}/gEDA/gschem-gtkrc
@@ -148,6 +162,15 @@
%Changelog
+* 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-gschem/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 29 Mar 2007 07:21:23 -0000 1.5
+++ sources 15 Jun 2007 12:29:31 -0000 1.6
@@ -1 +1 @@
-82e26c1de51482332eaf2a77e3368e29 geda-gschem-20070216.tar.gz
+638be7add265e8aaf86dcf60e56ea7c1 geda-gschem-20070526.tar.gz
More information about the scm-commits
mailing list