rpms/ktechlab/devel ktechlab-0.3.6-multilib.patch, NONE, 1.1 ktechlab.spec, 1.9, 1.10 ktechlab-0.3-ppc-includes.patch, 1.3, NONE
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Tue Jun 26 13:21:01 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/ktechlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29763/devel
Modified Files:
ktechlab.spec
Added Files:
ktechlab-0.3.6-multilib.patch
Removed Files:
ktechlab-0.3-ppc-includes.patch
Log Message:
ktechlab-0.3.6-multilib.patch:
--- NEW FILE ktechlab-0.3.6-multilib.patch ---
--- admin/libtool.m4.in 2007-06-26 00:27:15.000000000 +0200
+++ libtool.m4.in 2007-06-26 14:59:00.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*)
@@ -2097,7 +2097,7 @@
cygwin*)
lt_cv_deplibs_check_method=pass_all
;;
-
+
mingw* | pw32*)
# win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
@@ -2590,8 +2590,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])
@@ -3833,7 +3833,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.
@@ -3887,7 +3887,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 | \
@@ -4650,7 +4650,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
@@ -5010,7 +5010,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*
@@ -5374,9 +5374,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*)
@@ -5726,7 +5726,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/devel/ktechlab.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ktechlab.spec 26 Jun 2007 12:14:30 -0000 1.9
+++ ktechlab.spec 26 Jun 2007 13:20:26 -0000 1.10
@@ -1,6 +1,6 @@
Name: ktechlab
Version: 0.3.69
-Release: 1.20070626svn%{?dist}
+Release: 2.20070626svn%{?dist}
# revision checkout 18
Summary: Development and simulation of microcontrollers and electronic circuits
@@ -10,9 +10,7 @@
URL: http://sourceforge.net/projects/ktechlab/
Source: http://downloads.sourceforge.net/ktechlab/%{name}-%{version}.tar.bz2
-#Patch0: ktechlab-0.3-pic.patch
-#Patch1: ktechlab-0.3.desktop.patch
-Patch2: ktechlab-0.3-ppc-includes.patch
+Patch0: ktechlab-0.3.6-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,14 +38,10 @@
%prep
%setup -q
-#-n %{name}-0.3.6-devel
+
%{__rm} -rf autom4te.cache
-#%patch0 -p0 -b pic14.h
-#%patch1 -p0 -b ktechlab.desktop
-%ifarch ppc
-%patch2 -p1 -b .ppc-includes
-%endif
+%patch0 -p0 -b .multilib
%build
%configure --disable-rpath
@@ -58,13 +52,13 @@
%{__make} DESTDIR=%{buildroot} install
desktop-file-install --vendor fedora \
- --add-category Enginneering \
+ --add-category Engineering \
--delete-original \
--dir %{buildroot}%{_datadir}/applications/ \
%{buildroot}%{_datadir}/applnk/Development/%{name}.desktop
# Fix absolute symlink
-#%{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common
+%{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common
# No translation
%find_lang %{name}
@@ -97,6 +91,9 @@
%Changelog
+* Tue Jun 26 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-2.20070626svn
+- dropped ktechlab-0.3-ppc-includes.patch (fix in upstream)
+
* Tue Jun 26 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-1.20070626svn
- New svn snapshot
--- ktechlab-0.3-ppc-includes.patch DELETED ---
More information about the fedora-extras-commits
mailing list