packages: ltrace/ltrace-debian.patch, ltrace/ltrace.spec, ltrace/poor-mans-...

glen glen at pld-linux.org
Tue Sep 29 17:53:47 CEST 2009 

Author: glen                         Date: Tue Sep 29 15:53:47 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update to 0.5.3
- introduce poor mans autoconf as maintainer decided to kill ac stuff, sic!

---- Files affected:
packages/ltrace:
   ltrace-debian.patch (1.2 -> 1.3) , ltrace.spec (1.62 -> 1.63) , poor-mans-autoconf.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ltrace/ltrace-debian.patch
diff -u packages/ltrace/ltrace-debian.patch:1.2 packages/ltrace/ltrace-debian.patch:1.3
--- packages/ltrace/ltrace-debian.patch:1.2	Tue May 26 08:48:00 2009
+++ packages/ltrace/ltrace-debian.patch	Tue Sep 29 17:53:42 2009
@@ -26,8 +26,8 @@
  			options.output = fopen(optarg, "w");
  			if (!options.output) {
  				fprintf(stderr,
---- ltrace-0.5.orig/ltrace.c
-+++ ltrace-0.5/ltrace.c
+--- ltrace-0.5.orig/libltrace.c
++++ ltrace-0.5/libltrace.c
 @@ -54,6 +54,9 @@
  {
  	exiting = 1;

================================================================
Index: packages/ltrace/ltrace.spec
diff -u packages/ltrace/ltrace.spec:1.62 packages/ltrace/ltrace.spec:1.63
--- packages/ltrace/ltrace.spec:1.62	Sun Jun 21 16:43:01 2009
+++ packages/ltrace/ltrace.spec	Tue Sep 29 17:53:42 2009
@@ -6,17 +6,16 @@
 Summary(ru.UTF-8):	Выводит трассу библиотечных и системных вызовов программы
 Summary(uk.UTF-8):	Видає трасу бібліотечних та системних викликів програми
 Name:		ltrace
-Version:	0.5.2
-Release:	2
+Version:	0.5.3
+Release:	1
 License:	GPL v2+
 Group:		Development/Debuggers
 Source0:	ftp://ftp.debian.org/debian/pool/main/l/ltrace/%{name}_%{version}.orig.tar.gz
-# Source0-md5:	02ed50463640af24241567d0145a417f
+# Source0-md5:	3fa7fe715ab879db08bd06d1d59fd90f
 Patch0:		%{name}-Makefile.in.patch
 Patch1:		%{name}-debian.patch
+Patch2:		poor-mans-autoconf.patch
 URL:		http://ltrace.alioth.debian.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
 BuildRequires:	elfutils-devel
 # for libsupc++ (used for symbols demangling)
 BuildRequires:	gcc-c++
@@ -73,12 +72,15 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-cp -f /usr/share/automake/config.* .
-%{__aclocal}
-%{__autoconf}
-%configure
+CC="%{__cc}" \
+CFLAGS="%{rpmcflags}" \
+./configure \
+	--prefix=%{_prefix} \
+	--sysconfdir=%{_sysconfdir} \
+
 %{__make}
 
 %install
@@ -103,6 +105,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2009/09/29 15:53:42  glen
+- update to 0.5.3
+- introduce poor mans autoconf as maintainer decided to kill ac stuff, sic!
+
 Revision 1.62  2009/06/21 14:43:01  hawk
 - release 2
 
@@ -218,9 +224,9 @@
 - URL added
 
 Revision 1.26  2002/05/21 23:14:06  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.25  2002/05/18 21:25:39  marcus
 - ltrace builds and runs on PPC too
@@ -243,7 +249,7 @@
   Group field using gettext).
 
 Revision 1.20  2002/01/18 02:13:46  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.19  2002/01/18 00:00:52  kloczek
 - updated to 0.3.16 (bugfix release).
@@ -266,10 +272,10 @@
 - modyfications for using neew rpm automation.
 
 Revision 1.13  2000/06/09 07:54:44  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.12  2000/06/09 07:23:25  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.11  2000/04/10 17:06:17  baggins
 - more spelling fixes
@@ -314,13 +320,4 @@
 - update to ltrace-0.3.8
 
 Revision 1.1  1999/08/19 20:07:26  baggins
-almost raw
-
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
-- auto rebuild in the new build environment (release 2)
-
-* Fri Mar 12 1999 Jeff Johnson <jbj at redhat.com>
-- update to 0.3.6.
-
-* Mon Sep 21 1998 Preston Brown <pbrown at redhat.com>
-- upgraded to 0.3.4
+- almost raw

================================================================
Index: packages/ltrace/poor-mans-autoconf.patch
diff -u /dev/null packages/ltrace/poor-mans-autoconf.patch:1.1
--- /dev/null	Tue Sep 29 17:53:47 2009
+++ packages/ltrace/poor-mans-autoconf.patch	Tue Sep 29 17:53:42 2009
@@ -0,0 +1,89 @@
+yay for Juan Cespedes for killing autoconf, making configure no longer portable
+
+http://git.debian.org/?p=collab-maint/ltrace.git;a=commitdiff;h=f670eea50e959eeb9da53d70cad8d43c19494ef0
+
+--- ltrace-0.5.3/Makefile.in~	2009-09-29 18:22:49.000000000 +0300
++++ ltrace-0.5.3/Makefile.in	2009-09-29 18:40:52.608084066 +0300
+@@ -15,7 +15,7 @@
+ 
+ CC		=	@CC@
+ CFLAGS		=	-Wall @CFLAGS@
+-CPPFLAGS	=	-iquote $(TOPDIR) -iquote $(TOPDIR)/sysdeps/$(OS) -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@
++CPPFLAGS	=	@iquote@$(TOPDIR) @iquote@$(TOPDIR)/sysdeps/$(OS) @iquoteend@ -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@
+ LDFLAGS		=	@LDFLAGS@
+ LIBS		=	@LIBS@
+ 
+--- ltrace-0.5.3/configure~	2009-09-29 18:49:09.000000000 +0300
++++ ltrace-0.5.3/configure	2009-09-29 18:49:16.363340062 +0300
+@@ -6,6 +6,12 @@
+   exit 1
+ fi
+ 
++CC=${CC:-gcc}
++CPPFLAGS=' -I /usr/include/libelf'
++CFLAGS=${CFLAGS:-'-g -O2'}
++LIBS='-lelf -lsupc++ -liberty '
++INSTALL='/usr/bin/install -c'
++
+ echo -n "checking package name... "
+ PACKAGE_NAME='ltrace'
+ echo $PACKAGE_NAME
+@@ -30,7 +36,7 @@
+   return cplus_demangle();
+ }
+ EOF
+-if gcc conftest.c -liberty 2>/dev/null
++if $CC $CFLAGS conftest.c -liberty 2>/dev/null
+ then
+   HAVE_LIBIBERTY=1
+   echo "yes"
+@@ -48,7 +54,7 @@
+   return __cxa_demangle();
+ }
+ EOF
+-if gcc conftest.c -lsupc++ 2>/dev/null
++if $CC $CFLAGS conftest.c -lsupc++ 2>/dev/null
+ then
+   HAVE_LIBSUPC__=1
+   echo "yes"
+@@ -67,7 +73,7 @@
+   return 0;
+ }
+ EOF
+-if gcc conftest.c 2>/dev/null
++if $CC $CFLAGS conftest.c 2>/dev/null
+ then
+   HAVE_ELF_C_READ_MMAP=1
+   echo "yes"
+@@ -77,13 +83,24 @@
+ fi
+ rm -f conftest.c a.out
+ 
+-CC=gcc
+-CPPFLAGS=' -I /usr/include/libelf'
+-CFLAGS='-g -O2'
+-LIBS='-lelf -lsupc++ -liberty '
+-INSTALL='/usr/bin/install -c'
+-iquote='-iquote '
+-iquoteend=''
++# -iquote
++echo -n "checking whether compiler accepts -iquote dir... "
++cat > conftest.c << EOF
++int main () {
++  return 0;
++}
++EOF
++if $CC $CFLAGS -iquote . conftest.c 2>/dev/null
++then
++  iquote="-iquote "
++  iquoteend=""
++  echo "yes"
++else
++  iquote="-I "
++  iquoteend="-I-"
++  echo "no"
++fi
++rm -f conftest.c a.out
+ 
+ prefix=/usr/local
+ sysconfdir='${prefix}/etc'
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ltrace/ltrace-debian.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ltrace/ltrace.spec?r1=1.62&r2=1.63&f=u

More information about the pld-cvs-commit mailing list