rpms/libgeda/devel .cvsignore, 1.8, 1.9 libgeda.spec, 1.9, 1.10 sources, 1.8, 1.9

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4209/devel

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Jun 2007 07:47:01 -0000	1.8
+++ .cvsignore	14 Jul 2007 11:44:32 -0000	1.9
@@ -1 +1 @@
-libgeda-20070626.tar.gz
+libgeda-1.1.1.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/libgeda.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgeda.spec	27 Jun 2007 07:47:01 -0000	1.9
+++ libgeda.spec	14 Jul 2007 11:44:32 -0000	1.10
@@ -1,11 +1,7 @@
-# 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
+%define          real_ver 1.1.1
 
 Name:            libgeda
-Version:         20070626
+Version:         20070708
 Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
@@ -13,20 +9,14 @@
 License:         GPL
 URL:             http://www.geda.seul.org
 
-Source:          http://geda.seul.org/devel/1.0/1.0.1-20070626/%{name}-%{version}.tar.gz
+Source:          http://geda.seul.org/devel/v1.1/%{relver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
 
-BuildRequires:   gtk2-devel gd-devel gettext-devel
-
-#%if "%{FC_ver}" > "5"
-#BuildRequires:   compat-guile-16-devel
-#%else
-BuildRequires:   guile-devel
-#%endif
+BuildRequires:   gtk2-devel gd-devel gettext-devel guile-devel
 
 Obsoletes:       libgeda-doc
 
@@ -38,49 +28,18 @@
 Summary:         Development files for the libgeda library
 Group:           Development/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        gtk2-devel gd-devel gettext-devel
+Requires:        gtk2-devel gd-devel gettext-devel guile-devel
 
-#%if "%{FC_ver}" > "5"
-#Requires:   compat-guile-16-devel
-#%else
-Requires:   guile-devel
-#%endif
 
 %description devel
 Development files for libgeda library
 
 
 %prep
-%setup -q
-
-#%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
+%setup -q -n %{name}-%{real_ver}
 
 %build
 
-#%if "%{FC_ver}" > "5"
-#export GUILE_CFLAGS="-I%{_includedir}/libguile16 -I%{_includedir}/guile16"
-#export GUILE_LDFLAGS="-L%{_libdir}/guile16"
-#%endif
-
 %configure --disable-static --enable-gd
 %{__make} %{?_smp_mflags}
 
@@ -105,20 +64,23 @@
 #%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/
+#%dir %{_datadir}/gEDA/scheme
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS HACKING TODO COPYING ChangeLog README
 %dir %{_datadir}/gEDA/
+%dir %{_datadir}/gEDA/scheme
 %{_docdir}/gEDA/
 %{_libdir}/libgeda.so.*
 %{_datadir}/gEDA/prolog.ps
+%{_datadir}/gEDA/scheme/geda.scm
+%{_datadir}/gEDA/system-gafrc
 
 %files devel
 %defattr(-,root,root,-)
@@ -129,6 +91,9 @@
 
 
 %Changelog
+* Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
+- New upstream release
+
 * Tue Jun 27 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070626-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Jun 2007 07:47:01 -0000	1.8
+++ sources	14 Jul 2007 11:44:32 -0000	1.9
@@ -1 +1 @@
-8074a1167cc22ebabd6fecfedf2767a9  libgeda-20070626.tar.gz
+1dd9992b5375f88f827c618b0fa4abb8  libgeda-1.1.1.tar.gz