rpms/libgeda/devel .cvsignore, 1.6, 1.7 libgeda.spec, 1.7, 1.8 sources, 1.6, 1.7
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Fri Jun 15 12:17:56 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/libgeda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10942/devel
Modified Files:
.cvsignore libgeda.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 29 Mar 2007 07:14:40 -0000 1.6
+++ .cvsignore 15 Jun 2007 12:17:21 -0000 1.7
@@ -1 +1 @@
-libgeda-20070216.tar.gz
+libgeda-20070526.tar.gz
Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/libgeda.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libgeda.spec 29 Mar 2007 07:14:40 -0000 1.7
+++ libgeda.spec 15 Jun 2007 12:17:21 -0000 1.8
@@ -1,8 +1,12 @@
-# dropped support for FC5
-# but meanwhile sticking with guile-1.6 i.e compat-guile-16
+# 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: 20070216
-Release: 1%{?dist}
+Version: 20070526
+Release: 2%{?dist}
Summary: Libraries for the gEDA project
Group: System Environment/Libraries
@@ -18,29 +22,29 @@
BuildRequires: gtk2-devel gd-devel gettext-devel
-BuildRequires: compat-guile-16-devel
+#%if "%{FC_ver}" > "5"
+#BuildRequires: compat-guile-16-devel
+#%else
+BuildRequires: guile-devel
+#%endif
+
+Obsoletes: libgeda-doc
%description
This package contains libgeda, the library needed by gEDA applications.
-%package doc
-Summary: Documentation for libgeda, Libraries for the gEDA project
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-
-
-%description doc
-This package contains the documentation of pcb in html, pdf, postscript and
-info format.
-
-
%package devel
Summary: Development files for the libgeda library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: gtk2-devel, gd-devel
-Requires: compat-guile-16-devel gettext-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
@@ -49,40 +53,47 @@
%prep
%setup -q
-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
-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 --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
@@ -91,37 +102,46 @@
%{__rm} -rf %{buildroot}
# geda-symbols is the Owner of the following directories
-#%dir %{_datadir}/gEDA/bitmap
-#%dir %{_datadir}/gEDA/docs
-#%dir %{_datadir}/gEDA/docs/readmes
-#%dir %{_datadir}/gEDA/docs/man
-#%dir %{_datadir}/gEDA/examples
+#%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
-%{_libdir}/libgeda.so.*
+%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-2
+- dump release
+
+* 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 29 Mar 2007 07:14:40 -0000 1.6
+++ sources 15 Jun 2007 12:17:21 -0000 1.7
@@ -1 +1 @@
-4f197eaae6bc6b25521dcc4a47578cf5 libgeda-20070216.tar.gz
+a9104640475d9fae2f4e8dfa9c18f3fd libgeda-20070526.tar.gz
More information about the fedora-extras-commits
mailing list