rpms/geda-gschem/FC-5 geda-gschem.spec, 1.4, 1.5 gschem.desktop, 1.1, 1.2
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Sun Feb 4 22:31:49 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/geda-gschem/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17788/FC-5
Modified Files:
geda-gschem.spec gschem.desktop
Log Message:
auto-import geda-gschem-20061020-3 on branch FC-5 from geda-gschem-20061020-3.src.rpm
Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-5/geda-gschem.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geda-gschem.spec 3 Nov 2006 20:13:01 -0000 1.4
+++ geda-gschem.spec 4 Feb 2007 22:31:16 -0000 1.5
@@ -1,6 +1,6 @@
Name: geda-gschem
Version: 20061020
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Electronics schematics editor
Group: Applications/Engineering
@@ -12,10 +12,6 @@
# Source 2: from the geda package
Source2: gschem.xpm
-# by Andy Shevchenko #206280
-#TO BE TESTED
-#Patch0: geda-gschem-ru.po.diff
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgeda-devel, desktop-file-utils, autoconf, libstroke-devel
@@ -27,20 +23,31 @@
%prep
%setup -q
-#%patch0 -p0 -b ru.po
+
+# 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
+
+# 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
-# DO NOT CLEAN this for the next 2 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 --with-docdir=%{_datadir}/gEDA/docs
%{__make} %{?_smp_mflags}
@@ -55,9 +62,8 @@
install -p -m 644 examples/README.* %{buildroot}%{_datadir}/gEDA/examples
install -p -m 644 scheme/*.scm %{buildroot}%{_datadir}/gEDA/scheme
-desktop-file-install --vendor fedora \
- --add-category Engineering \
- --add-category X-Fedora \
+desktop-file-install --vendor "" \
+ --add-category Engineering \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
@@ -134,12 +140,18 @@
%{_datadir}/gEDA/gschem-gtkrc
%{_datadir}/gEDA/gschem-darkbg
%{_datadir}/gEDA/gschem-lightbg
-%{_datadir}/applications/fedora-gschem.desktop
+%{_datadir}/applications/gschem.desktop
%{_datadir}/icons/hicolor/32x32/apps/gschem.xpm
%{_mandir}/man1/gschem.*
%Changelog
+* Sun Feb 04 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-3
+- Fixed presence on Gnome menu
+
+* 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
Index: gschem.desktop
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-5/gschem.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gschem.desktop 5 Sep 2006 07:14:54 -0000 1.1
+++ gschem.desktop 4 Feb 2007 22:31:17 -0000 1.2
@@ -7,5 +7,5 @@
Icon=gschem
Terminal=false
Type=Application
-Categories=Education;Science;X-Fedora;Engineering;
+Categories=Qt;KDE;Education;Science;
X-Desktop-File-Install-Version=0.10
More information about the scm-commits
mailing list