rpms/geda-gattrib/devel gattrib.desktop, 1.1, 1.2 geda-gattrib.spec, 1.3, 1.4

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/geda-gattrib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8847/devel

Modified Files:
	gattrib.desktop geda-gattrib.spec 
Log Message:
auto-import geda-gattrib-20061020-2 on branch devel from geda-gattrib-20061020-2.src.rpm


Index: gattrib.desktop
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/devel/gattrib.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gattrib.desktop	5 Sep 2006 15:15:40 -0000	1.1
+++ gattrib.desktop	13 Jan 2007 16:34:16 -0000	1.2
@@ -7,5 +7,5 @@
 Icon=gattrib
 Terminal=false
 Type=Application
-Categories=Education;Science;X-Fedora;Engineering;
+Categories=Science;
 Version=20050820


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/devel/geda-gattrib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geda-gattrib.spec	3 Nov 2006 20:10:32 -0000	1.3
+++ geda-gattrib.spec	13 Jan 2007 16:34:16 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           geda-gattrib
 Version:        20061020
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Attribute editor for gEDA
 Group:          Applications/Engineering
@@ -14,7 +14,7 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgeda-devel, desktop-file-utils
-#, autoconf
+
 Requires:       geda-symbols
 
 %description
@@ -30,18 +30,30 @@
 %prep
 %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
+
+# 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
+
 %build
-#NOT TO BE CLEAN for the next two upstream releases
-#%{__cp} -p configure.ac configure.ac.gdgeda
-#cat configure.ac.gdgeda | \
-#   sed -e 's|libgdgeda|gdlib|g'| \
-#   sed -e 's|gdgeda|gd|g' \
-#   > configure.ac
-
-#autoconf
-#for f in `find . -name \*.c -or -name \*.h` ; do
-#   sed -i -e 's|gdgeda/gd.h|gd.h|' $f
-#done
+export GUILE_CFLAGS="-I%{_includedir}/libguile16 -I%{_includedir}/guile16"
+export GUILE_LDFLAGS="-L%{_libdir}/guile16"
+
 
 %configure
 %{__make} %{?_smp_mflags}
@@ -50,10 +62,9 @@
 %{__rm} -rf %{buildroot}
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
-desktop-file-install --vendor=fedora \
+desktop-file-install --vendor="" \
     --add-category Engineering \
     --dir=%{buildroot}%{_datadir}/applications \
-    --add-category=X-Fedora \
     %{SOURCE1}
 
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
@@ -85,10 +96,13 @@
 %doc design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
 %{_bindir}/gattrib
 %{_datadir}/gEDA/system-gattribrc
-%{_datadir}/applications/fedora-gattrib.desktop
+%{_datadir}/applications/gattrib.desktop
 %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm
 
 %Changelog
+* Mon Jan 08 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-2
+- rebuilt under compat-guile-16
+
 * Thu Nov 02 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-1
 - New upstream Release