rpms/clpbar/devel bar-1.10.9-Makefile.patch, NONE, 1.1 bar-1.10.9-clpbar.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
David Cantrell
dcantrel at fedoraproject.org
Tue May 25 21:17:33 UTC 2010
Author: dcantrel
Update of /cvs/pkgs/rpms/clpbar/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21499
Modified Files:
.cvsignore sources
Added Files:
bar-1.10.9-Makefile.patch bar-1.10.9-clpbar.patch
Log Message:
* Wed May 19 2010 David Cantrell <dcantrell at redhat.com> - 1.10.9-3
- Fix empty debuginfo package (#560176)
bar-1.10.9-Makefile.patch:
Makefile.am | 4 ++--
Makefile.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE bar-1.10.9-Makefile.patch ---
diff -urN bar-1.10.9.orig/Makefile.am bar-1.10.9/Makefile.am
--- bar-1.10.9.orig/Makefile.am 2007-06-06 10:44:05.000000000 -1000
+++ bar-1.10.9/Makefile.am 2010-05-19 03:34:36.000000000 -1000
@@ -12,10 +12,10 @@
#
# CFLAGS =
-CFLAGS = -O2
+CFLAGS ?= -O2
# CFLAGS = -g -Wall
-LDFLAGS = -s
+LDFLAGS ?= -s
# LDFLAGS =
bin_PROGRAMS =
diff -urN bar-1.10.9.orig/Makefile.in bar-1.10.9/Makefile.in
--- bar-1.10.9.orig/Makefile.in 2007-06-28 03:11:32.000000000 -1000
+++ bar-1.10.9/Makefile.in 2010-05-19 03:35:18.000000000 -1000
@@ -128,7 +128,7 @@
CCDEPMODE = @CCDEPMODE@
# CFLAGS =
-CFLAGS = -O2
+CFLAGS ?= -O2
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -150,7 +150,7 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
# CFLAGS = -g -Wall
-LDFLAGS = -s
+LDFLAGS ?= -s
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
bar-1.10.9-clpbar.patch:
Makefile.am | 6 +++---
args.c | 4 ++--
clpbar.1.in |only
configure.in | 4 ++--
test-001 | 2 +-
test-002 | 8 ++++----
test-003 | 6 +++---
test-004 | 4 ++--
8 files changed, 17 insertions(+), 17 deletions(-)
--- NEW FILE bar-1.10.9-clpbar.patch ---
diff -ur bar-1.10.9.orig/Makefile.am bar-1.10.9/Makefile.am
--- bar-1.10.9.orig/Makefile.am 2007-06-06 10:44:05.000000000 -1000
+++ bar-1.10.9/Makefile.am 2010-02-01 16:26:18.000000000 -1000
@@ -85,14 +85,14 @@
DISTCLEANFILES += ./log.test-*
-bin_PROGRAMS += bar
+bin_PROGRAMS += clpbar
noinst_HEADERS += types.h
noinst_HEADERS += error.h
noinst_HEADERS += fd.h
noinst_HEADERS += io.h
noinst_HEADERS += display.h
noinst_HEADERS += args.h
-bar_SOURCES = \
+clpbar_SOURCES = \
error.c \
fd.c \
io.c \
@@ -101,7 +101,7 @@
bar.c \
#
-man_MANS += bar.1
+man_MANS += clpbar.1
EXTRA_DIST += $(man_MANS)
# EXTRA_DIST += PORTING
diff -ur bar-1.10.9.orig/args.c bar-1.10.9/args.c
--- bar-1.10.9.orig/args.c 2007-06-28 03:09:58.000000000 -1000
+++ bar-1.10.9/args.c 2010-02-01 17:12:11.000000000 -1000
@@ -2808,12 +2808,12 @@
home_dir = getenv("HOME");
if (home_dir != 0) {
- sprintf(filename, "%.*s/.barrc", 4088, home_dir);
+ sprintf(filename, "%.*s/.clpbarrc", 4091, home_dir);
if (parse_rcfile(ferr, filename) != 0)
return(1);
}
- sprintf(filename, "./.barrc");
+ sprintf(filename, "./.clpbarrc");
if (parse_rcfile(ferr, filename) != 0)
return(1);
Only in bar-1.10.9: clpbar.1.in
diff -ur bar-1.10.9.orig/configure.in bar-1.10.9/configure.in
--- bar-1.10.9.orig/configure.in 2007-06-28 03:09:35.000000000 -1000
+++ bar-1.10.9/configure.in 2010-02-01 16:39:14.000000000 -1000
@@ -1,6 +1,6 @@
AC_INIT(bar.c)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(bar,1.10.9)
+AM_INIT_AUTOMAKE(clpbar,1.10.9)
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
@@ -571,7 +571,7 @@
AC_DEFINE(USE_IOVEC,1,[Use vectored I/O (if available)])
fi
-AC_CONFIG_FILES([Makefile bar.1 doxygen.conf])
+AC_CONFIG_FILES([Makefile clpbar.1 doxygen.conf])
AC_CONFIG_COMMANDS([test-script-preparation],[chmod u+x test-00?])
AC_OUTPUT
diff -ur bar-1.10.9.orig/test-001 bar-1.10.9/test-001
--- bar-1.10.9.orig/test-001 2006-10-03 05:58:54.000000000 -1000
+++ bar-1.10.9/test-001 2010-02-01 17:16:32.000000000 -1000
@@ -1,5 +1,5 @@
#!/bin/sh
-./test-001-pre | ./bar 2> /dev/null | ./test-001-post
+./test-001-pre | ./clpbar 2> /dev/null | ./test-001-post
if [ "$?" -ne 0 ]; then exit 1; fi
exit 0
diff -ur bar-1.10.9.orig/test-002 bar-1.10.9/test-002
--- bar-1.10.9.orig/test-002 2006-10-03 05:58:54.000000000 -1000
+++ bar-1.10.9/test-002 2010-02-01 17:16:42.000000000 -1000
@@ -22,9 +22,9 @@
exit 1
fi
-./bar -if ${src_file} -of ${dst_file} 2> /dev/null
+./clpbar -if ${src_file} -of ${dst_file} 2> /dev/null
if [ "$?" -ne 0 ]; then
- echo "*** ERROR: ./bar failed"
+ echo "*** ERROR: ./clpbar failed"
exit 1
fi
cmp ${src_file} ${dst_file} > /dev/null 2>&1
@@ -33,9 +33,9 @@
exit 1
fi
-cat ${src_file} | ./bar 2> /dev/null > ${dst_file}
+cat ${src_file} | ./clpbar 2> /dev/null > ${dst_file}
if [ "$?" -ne 0 ]; then
- echo "*** ERROR: ./bar failed"
+ echo "*** ERROR: ./clpbar failed"
exit 1
fi
cmp ${src_file} ${dst_file} > /dev/null 2>&1
diff -ur bar-1.10.9.orig/test-003 bar-1.10.9/test-003
--- bar-1.10.9.orig/test-003 2006-10-03 05:58:54.000000000 -1000
+++ bar-1.10.9/test-003 2010-02-01 17:16:53.000000000 -1000
@@ -41,10 +41,10 @@
exit 1
fi
-echo "- Copying file through bar..."
-./bar -if ${src_file} -of ${dst_file} 2> /dev/null
+echo "- Copying file through clpbar..."
+./clpbar -if ${src_file} -of ${dst_file} 2> /dev/null
if [ "$?" -ne 0 ]; then
- echo "*** ERROR: bar failed"
+ echo "*** ERROR: clpbar failed"
exit 1
fi
diff -ur bar-1.10.9.orig/test-004 bar-1.10.9/test-004
--- bar-1.10.9.orig/test-004 2006-10-03 05:58:54.000000000 -1000
+++ bar-1.10.9/test-004 2010-02-01 17:17:01.000000000 -1000
@@ -69,7 +69,7 @@
dd \
if=${dst_file_1} \
2> /dev/null \
- | ./bar \
+ | ./clpbar \
-s ${block_count}b \
-of ${dst_file_2} \
-bl ${block_size} \
@@ -77,7 +77,7 @@
2> /dev/null \
#
if [ "$?" -ne 0 ]; then
- echo "ERROR: bar failed"
+ echo "ERROR: clpbar failed"
exit 1
fi
cmp ${dst_file_1} ${dst_file_2}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clpbar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 25 May 2010 21:00:53 -0000 1.1
+++ .cvsignore 25 May 2010 21:17:33 -0000 1.2
@@ -0,0 +1 @@
+bar_1.10.9.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clpbar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 25 May 2010 21:00:53 -0000 1.1
+++ sources 25 May 2010 21:17:33 -0000 1.2
@@ -0,0 +1 @@
+d824415b391a3f826b410c86223e54a5 bar_1.10.9.tar.gz
More information about the scm-commits
mailing list