rpms/ktechlab/FC-6 ktechlab-0.3-multilib.patch, NONE, 1.1 ktechlab.spec, 1.8, 1.9
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Mon Aug 13 10:47:05 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/ktechlab/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20368/FC-6
Modified Files:
ktechlab.spec
Added Files:
ktechlab-0.3-multilib.patch
Log Message:
ktechlab-0.3-multilib.patch:
--- NEW FILE ktechlab-0.3-multilib.patch ---
--- admin/libtool.m4.in 2005-12-30 12:22:14.000000000 +0100
+++ libtool.m4.in 2007-06-28 17:55:31.000000000 +0200
@@ -835,7 +835,7 @@
lt_cv_dlopen_self=yes
])
;;
-
+
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
@@ -1072,7 +1072,7 @@
*)
AC_MSG_RESULT([no])
;;
- esac
+ esac
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
@@ -1443,7 +1443,7 @@
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
+ dynamic_linker='GNU ld.so'
;;
netbsd*)
@@ -2575,8 +2575,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
+ fi
+ ;;
esac
AC_MSG_RESULT([$enable_shared])
@@ -3807,7 +3807,7 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
- fi
+ fi
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -3861,7 +3861,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
@@ -4624,7 +4624,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
+ ;;
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
@@ -4984,7 +4984,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
@@ -5337,9 +5337,9 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
+ else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
+ fi
;;
dgux*)
@@ -5689,7 +5689,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
+
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/FC-6/ktechlab.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ktechlab.spec 26 Apr 2007 15:41:11 -0000 1.8
+++ ktechlab.spec 13 Aug 2007 10:46:33 -0000 1.9
@@ -1,6 +1,6 @@
Name: ktechlab
Version: 0.3.6
-Release: 2%{?dist}
+Release: 5%{?dist}
Summary: Development and simulation of microcontrollers and electronic circuits
License: GPL
@@ -12,6 +12,7 @@
Patch0: ktechlab-0.3-pic.patch
Patch1: ktechlab-0.3.desktop.patch
Patch2: ktechlab-0.3-ppc-includes.patch
+Patch3: ktechlab-0.3-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,10 +44,13 @@
%patch0 -p0 -b pic14.h
%patch1 -p0 -b ktechlab.desktop
-%ifarch ppc
+
+%ifarch ppc ppc64
%patch2 -p1 -b .ppc-includes
%endif
+%patch3 -p0 -b .multilib
+
%build
%configure --disable-rpath
%{__make} %{?_smp_mflags}
@@ -55,7 +59,7 @@
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
-desktop-file-install --vendor "" \
+desktop-file-install --vendor fedora \
--add-category Enginneering \
--delete-original \
--dir %{buildroot}%{_datadir}/applications/ \
@@ -64,6 +68,15 @@
# Fix absolute symlink
%{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common
+
+#setting default path for sdcc
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/profile.d
+cat > %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh << EOF
+# setting default path for sdcc - fedora
+export PATH=$PATH:%{_libexecdir}/sdcc
+EOF
+chmod 0755 %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
+
# No translation
#%find_lang %{name}
@@ -90,11 +103,21 @@
%{_datadir}/apps/katepart/syntax/microbe.xml
%{_datadir}/config.kcfg/%{name}.kcfg
%{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/*/*.png
+%{_sysconfdir}/profile.d/%{name}.sh
%Changelog
+* Sun Aug 12 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.3.6-5
+- added sdcc to path
+
+* Thu Jun 28 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.3.6-4
+- fix for ppc64
+
+* Thu Jun 28 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.3.6-3
+- add patch multilib to enable build for ppc64 architecture
+
* Fri Apr 20 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.3.6-2
- rebuild
More information about the fedora-extras-commits
mailing list