rpms/libgeda/FC-5 .cvsignore, 1.5, 1.6 libgeda.spec, 1.5, 1.6 sources, 1.5, 1.6

Fri Jun 15 11:47:43 UTC 2007

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2489/FC-5

Modified Files:
	.cvsignore libgeda.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	3 Nov 2006 20:09:45 -0000	1.5
+++ .cvsignore	15 Jun 2007 11:47:06 -0000	1.6
@@ -1 +1 @@
-libgeda-20061020.tar.gz
+libgeda-20070526.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/libgeda.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libgeda.spec	3 Nov 2006 20:09:45 -0000	1.5
+++ libgeda.spec	15 Jun 2007 11:47:06 -0000	1.6
@@ -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:            libgeda
-Version:         20061020
+Version:         20070526
 Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
@@ -8,35 +14,37 @@
 URL:             http://www.geda.seul.org
 
 Source:          ftp://ftp.geda.seul.org/pub/geda/devel/%{version}/%{name}-%{version}.tar.gz
-#Patch0:          %{name}-%{version}-arc.patch
-#Patch1:          %{name}-%{version}-configure.patch
+
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
 
-BuildRequires:   gtk2-devel, guile-devel, autoconf, gd-devel
-
-%description
-This package contains libgeda, the library needed by gEDA applications.
-
+BuildRequires:   gtk2-devel gd-devel gettext-devel
 
-%package doc
-Summary:         Documentation for libgeda, Libraries for the gEDA project
-Group:           Documentation
-Requires:        %{name} = %{version}-%{release}
+#%if "%{FC_ver}" > "5"
+#BuildRequires:   compat-guile-16-devel
+#%else
+BuildRequires:   guile-devel
+#%endif
 
+Obsoletes:       libgeda-doc
 
-%description doc
-This package contains the documentation of pcb in html, pdf, postscript and
-info format.
+%description
+This package contains libgeda, the library needed by gEDA applications.
 
 
 %package devel
 Summary:         Development files for the libgeda library
 Group:           Development/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        guile-devel, gtk2-devel, gd-devel
+Requires:        gtk2-devel gd-devel gettext-devel
+
+#%if "%{FC_ver}" > "5"
+#Requires:   compat-guile-16-devel
+#%else
+Requires:   guile-devel
+#%endif
 
 %description devel
 Development files for libgeda library
@@ -44,25 +52,48 @@
 
 %prep
 %setup -q
-#%patch0 -p0 -b o_arc_basic.c
-#%patch1 -p0 -b configure.ac
+
+#%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
+#%endif
 
 %build
 
-autoconf
-for f in `find . -name \*.c -or -name \*.h` ; do
-   sed -i -e 's|gdgeda/gd.h|gd.h|' $f
-done
+#%if "%{FC_ver}" > "5"
+#export GUILE_CFLAGS="-I%{_includedir}/libguile16 -I%{_includedir}/guile16"
+#export GUILE_LDFLAGS="-L%{_libdir}/guile16"
+#%endif
 
-%configure --disable-static
+%configure --disable-static --enable-gd
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
+
 %{__rm} -f %{buildroot}%{_infodir}/dir
 %{__rm} -f %{buildroot}%{_libdir}/*.la
+
 %{__rm} -rf docs/Makefile*
+%{__install} -d %{buildroot}%{_docdir}/gEDA/
+%{__mv} docs/* %{buildroot}%{_docdir}/gEDA/
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -70,29 +101,56 @@
 %clean
 %{__rm} -rf %{buildroot}
 
+# geda-symbols is the Owner of the following directories
+#%dir %{_docdir}/gEDA/readmes
+#%dir %{_docdir}/gEDA/man
+#%dir %{_docdir}/gEDA/examples
+#%dir %{_datadir}/gEDA/scheme
+#%dir %{_datadir}/gEDA/bitmap
+
+# libgeda is the Owner of the following directories
+#%dir %{_datadir}/gEDA
+#%dir %{_datadir}/doc/gEDA/
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog README
+%doc AUTHORS BUGS HACKING TODO COPYING ChangeLog README
+%dir %{_datadir}/gEDA/
+%{_docdir}/gEDA/
 %{_libdir}/libgeda.so.*
 %{_datadir}/gEDA/prolog.ps
 
 %files devel
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS HACKING TODO
-%{_includedir}/libgeda
+%{_includedir}/libgeda/
 %{_libdir}/libgeda.so
 %{_libdir}/pkgconfig/libgeda.pc
 
 
-%files doc
-%defattr(-, root, root, -)
-%doc docs/*
-
 
 %Changelog
+* Thu Jun 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070526-1
+- new upstream release
+- dropped useless -doc package
+
+* 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
+- bugfix: #233861 - unowned %%{_datadir}/gEDA/ directory
+
+* Sat Jan 06 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 20061020-3
+- Fix the replacement for guile 1.6
+
+* Fri Dec 07 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20061020-2
+- Downgraded to guile-1.6 for BR
+
 * Wed Nov 01 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-1
-- New upstreeam release
+- New upstream release
 
 * Wed Oct 11 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-3
 - Fixes Bug 210121 Printing does not produce correct post-script


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 20:09:45 -0000	1.5
+++ sources	15 Jun 2007 11:47:06 -0000	1.6
@@ -1 +1 @@
-3caf1aeee5627706b9abe54f6601a7dc  libgeda-20061020.tar.gz
+a9104640475d9fae2f4e8dfa9c18f3fd  libgeda-20070526.tar.gz


