rpms/libconcord/devel libconcord-0.21-mime-type-def.patch, 1.2, 1.3 libconcord.spec, 1.9, 1.10

Douglas E. Warner silfreed at fedoraproject.org
Thu Jul 30 18:16:23 UTC 2009 

Author: silfreed

Update of /cvs/pkgs/rpms/libconcord/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14853

Modified Files:
	libconcord-0.21-mime-type-def.patch libconcord.spec 
Log Message:
* Thu Jul 30 2009 Douglas E. Warner <silfreed at silfreed.net> 0.21-6
- updated patch w/ autoreconf run


libconcord-0.21-mime-type-def.patch:
 Makefile.am             |   22 +
 Makefile.in             |  267 +++++++++++++-----
 aclocal.m4              |  328 +++++++++++++----------
 autom4te.cache/output.0 |  638 +++++++++++++++++++++++++++-----------------
 autom4te.cache/output.1 |  638 +++++++++++++++++++++++++++-----------------
 autom4te.cache/requests |   48 +--
 autom4te.cache/traces.0 |  560 ++++++++++++++++++++++-----------------
 autom4te.cache/traces.1 |  120 ++++----
 config.guess            |   51 +++
 config.h.in             |    3 
 config.h.in~            |   61 ++++
 config.sub              |   54 ++-
 configure               |  684 +++++++++++++++++++++++++++++-------------------
 configure.ac            |   17 +
 depcomp                 |   87 ++++--
 install-sh              |    5 
 libconcord.xml          |   12 
 ltmain.sh               |   12 
 missing                 |   49 ++-
 19 files changed, 2295 insertions(+), 1361 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 libconcord-0.21-mime-type-def.patchIndex: libconcord-0.21-mime-type-def.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libconcord/devel/libconcord-0.21-mime-type-def.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libconcord-0.21-mime-type-def.patch	17 Jun 2009 20:15:56 -0000	1.2
+++ libconcord-0.21-mime-type-def.patch	30 Jul 2009 18:16:22 -0000	1.3
@@ -1,6 +1,25 @@
-diff -ruN concordance-0.21/libconcord/aclocal.m4 concordance-0.21-new/libconcord/aclocal.m4
---- concordance-0.21/libconcord/aclocal.m4	2009-03-08 15:07:43.000000000 -0400
-+++ concordance-0.21-new/libconcord/aclocal.m4	2009-06-17 15:27:59.000000000 -0400
+diff -ruN concordance-0.21-orig/libconcord/aclocal.m4 concordance-0.21/libconcord/aclocal.m4
+--- concordance-0.21-orig/libconcord/aclocal.m4	2009-03-08 15:07:43.000000000 -0400
++++ concordance-0.21/libconcord/aclocal.m4	2009-07-30 14:03:36.000000000 -0400
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.11 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,7 +13,7 @@
+ 
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(AC_AUTOCONF_VERSION, [2.63],,
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+ [m4_warning([this file was generated for autoconf 2.63.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
 @@ -21,7 +21,7 @@
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -113,50557 +132,3238 @@ diff -ruN concordance-0.21/libconcord/ac
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-diff -ruN concordance-0.21/libconcord/autom4te.cache/output.0 concordance-0.21-new/libconcord/autom4te.cache/output.0
---- concordance-0.21/libconcord/autom4te.cache/output.0	2009-03-08 15:07:42.000000000 -0400
-+++ concordance-0.21-new/libconcord/autom4te.cache/output.0	1969-12-31 19:00:00.000000000 -0500
-@@ -1,22109 +0,0 @@
--@%:@! /bin/sh
--@%:@ Guess values for system-dependent variables and create Makefiles.
--@%:@ Generated by GNU Autoconf 2.63 for libconcord 0.21.
--@%:@
--@%:@ Report bugs to <bug-automake at gnu.org>.
--@%:@ 
--@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--@%:@ This configure script is free software; the Free Software Foundation
--@%:@ gives unlimited permission to copy, distribute and modify it.
--## --------------------- ##
--## M4sh Initialization.  ##
--## --------------------- ##
--
--# Be more Bourne compatible
--DUALCASE=1; export DUALCASE # for MKS sh
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
--  emulate sh
--  NULLCMD=:
--  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
--  # is contrary to our usage.  Disable this feature.
--  alias -g '${1+"$@"}'='"$@"'
--  setopt NO_GLOB_SUBST
--else
--  case `(set -o) 2>/dev/null` in
--  *posix*) set -o posix ;;
--esac
--
--fi
--
--
--
--
--# PATH needs CR
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
--as_nl='
--'
--export as_nl
--# Printing a long string crashes Solaris 7 /usr/bin/printf.
--as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
--as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
--if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
--  as_echo='printf %s\n'
--  as_echo_n='printf %s'
--else
--  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
--    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
--    as_echo_n='/usr/ucb/echo -n'
+@@ -6671,7 +6658,7 @@
+ AC_MSG_RESULT([$SED])
+ ])
+ 
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -6683,10 +6670,10 @@
+ # generated from the m4 files accompanying Automake X.Y.
+ # (This private macro should not be called outside this file.)
+ AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.10'
++[am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.10.1], [],
++m4_if([$1], [1.11], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -6700,12 +6687,12 @@
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.10.1])dnl
++[AM_AUTOMAKE_VERSION([1.11])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+ 
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+@@ -6762,14 +6749,14 @@
+ 
+ # AM_CONDITIONAL                                            -*- Autoconf -*-
+ 
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 8
++# serial 9
+ 
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -6782,6 +6769,7 @@
+ AC_SUBST([$1_FALSE])dnl
+ _AM_SUBST_NOTMAKE([$1_TRUE])dnl
+ _AM_SUBST_NOTMAKE([$1_FALSE])dnl
++m4_define([_AM_COND_VALUE_$1], [$2])dnl
+ if $2; then
+   $1_TRUE=
+   $1_FALSE='#'
+@@ -6795,14 +6783,14 @@
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+ 
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 9
++# serial 10
+ 
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -6859,6 +6847,16 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+   fi
++  am__universal=false
++  m4_case([$1], [CC],
++    [case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac],
++    [CXX],
++    [case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac])
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -6876,7 +6874,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
[...60651 lines suppressed...]
+@@ -642,27 +733,30 @@
  
  ps-am:
  
 -uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
+-
+-.MAKE: install-am install-strip
 +uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
 +	uninstall-newmimeDATA
 +	@$(NORMAL_INSTALL)
 +	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
- 
--.MAKE: install-am install-strip
-+.MAKE: install-am install-data-am install-strip uninstall-am
++.MAKE: all install-am install-data-am install-strip uninstall-am
  
  .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
  	clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
-@@ -653,16 +688,17 @@
+ 	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
+-	dist-zip distcheck distclean distclean-compile \
++	dist-xz dist-zip distcheck distclean distclean-compile \
  	distclean-generic distclean-hdr distclean-libtool \
  	distclean-tags distcleancheck distdir distuninstallcheck dvi \
  	dvi-am html html-am info info-am install install-am \
@@ -55475,7 +6793,7 @@ diff -ruN concordance-0.21/libconcord/Ma
  
  
  # udev and friends support
-@@ -694,6 +730,16 @@
+@@ -694,6 +788,17 @@
  	$(MKDIR_P) $(DESTDIR)$(datarootdir)/hal/fdi/policy/10osvendor/
  	$(install_sh_DATA) libconcord.perms \
  		$(DESTDIR)$(datarootdir)/hal/fdi/policy/10osvendor/99-libconcord.perms
@@ -55489,6 +6807,165 @@ diff -ruN concordance-0.21/libconcord/Ma
 + at HAVE_NEW_MIME_TRUE@	if test -z "$(DESTDIR)"; then \
 + at HAVE_NEW_MIME_TRUE@		$(UPDATE_MIME_DATABASE) "$(datadir)/mime"; \
 + at HAVE_NEW_MIME_TRUE@	fi
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
+diff -ruN concordance-0.21-orig/libconcord/missing concordance-0.21/libconcord/missing
+--- concordance-0.21-orig/libconcord/missing	2009-03-08 15:07:49.000000000 -0400
++++ concordance-0.21/libconcord/missing	2009-07-30 14:03:41.000000000 -0400
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+ 
+-scriptversion=2006-05-10.23
++scriptversion=2009-04-28.21; # UTC
+ 
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+-#   Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
++# 2008, 2009 Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+ 
+ # This program is free software; you can redistribute it and/or modify
+@@ -18,9 +18,7 @@
+ # GNU General Public License for more details.
+ 
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -89,6 +87,9 @@
+   tar          try tar, gnutar, gtar, then tar without non-portable flags
+   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+ 
++Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
++\`g' are ignored when checking the name.
++
+ Send bug reports to <bug-automake at gnu.org>."
+     exit $?
+     ;;
+@@ -106,15 +107,22 @@
+ 
+ esac
+ 
++# normalize program name to check for.
++program=`echo "$1" | sed '
++  s/^gnu-//; t
++  s/^gnu//; t
++  s/^g//; t'`
++
+ # Now exit if we have it, but it failed.  Also exit now if we
+ # don't have it and --version was passed (most likely to detect
+-# the program).
++# the program).  This is about non-GNU programs, so use $1 not
++# $program.
+ case $1 in
+-  lex|yacc)
++  lex*|yacc*)
+     # Not GNU programs, they don't have --version.
+     ;;
+ 
+-  tar)
++  tar*)
+     if test -n "$run"; then
+        echo 1>&2 "ERROR: \`tar' requires --run"
+        exit 1
+@@ -138,7 +146,7 @@
+ 
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+-case $1 in
++case $program in
+   aclocal*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+@@ -148,7 +156,7 @@
+     touch aclocal.m4
+     ;;
+ 
+-  autoconf)
++  autoconf*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+          you modified \`${configure_ac}'.  You might want to install the
+@@ -157,7 +165,7 @@
+     touch configure
+     ;;
+ 
+-  autoheader)
++  autoheader*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+@@ -187,7 +195,7 @@
+ 	   while read f; do touch "$f"; done
+     ;;
+ 
+-  autom4te)
++  autom4te*)
+     echo 1>&2 "\
+ WARNING: \`$1' is needed, but is $msg.
+          You might have modified some files without having the
+@@ -210,7 +218,7 @@
+     fi
+     ;;
+ 
+-  bison|yacc)
++  bison*|yacc*)
+     echo 1>&2 "\
+ WARNING: \`$1' $msg.  You should only need it if
+          you modified a \`.y' file.  You may need the \`Bison' package
+@@ -240,7 +248,7 @@
+     fi
+     ;;
+ 
+-  lex|flex)
++  lex*|flex*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+          you modified a \`.l' file.  You may need the \`Flex' package
+@@ -263,7 +271,7 @@
+     fi
+     ;;
+ 
+-  help2man)
++  help2man*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+ 	 you modified a dependency of a manual page.  You may need the
+@@ -277,11 +285,11 @@
+     else
+ 	test -z "$file" || exec >$file
+ 	echo ".ab help2man is required to generate this page"
+-	exit 1
++	exit $?
+     fi
+     ;;
+ 
+-  makeinfo)
++  makeinfo*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+          you modified a \`.texi' or \`.texinfo' file, or any other file
+@@ -310,7 +318,7 @@
+     touch $file
+     ;;
+ 
+-  tar)
++  tar*)
+     shift
+ 
+     # We have already tried tar in the generic part.
+@@ -363,5 +371,6 @@
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-end: "$"
++# time-stamp-time-zone: "UTC"
++# time-stamp-end: "; # UTC"
+ # End:


Index: libconcord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libconcord/devel/libconcord.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libconcord.spec	25 Jul 2009 05:27:50 -0000	1.9
+++ libconcord.spec	30 Jul 2009 18:16:23 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name: libconcord
 Version: 0.21
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Library to talk to Logitech Harmony universal remote controls
 
 Group: Development/Libraries
@@ -62,7 +62,6 @@ Python bindings for libconcord
 
 %build
 cd %{name}
-autoreconf -i
 %configure --disable-static --disable-mime-update
 make %{_smp_mflags}
 make policykit
@@ -174,6 +173,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Thu Jul 30 2009 Douglas E. Warner <silfreed at silfreed.net> 0.21-6
+- updated patch w/ autoreconf run
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

More information about the scm-commits mailing list