rpms/libconcord/F-10 libconcord-0.21-mime-type-def.patch, 1.1, 1.2 libconcord.spec, 1.5, 1.6
Douglas E. Warner
silfreed at fedoraproject.org
Fri Jul 31 17:08:50 UTC 2009
Author: silfreed
Update of /cvs/pkgs/rpms/libconcord/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19772
Modified Files:
libconcord-0.21-mime-type-def.patch libconcord.spec
Log Message:
* Fri Jul 31 2009 Douglas E. Warner <silfreed at silfreed.net> 0.21-4
- updating mime patch with different source:
http://stuff.onse.fi/concordance-mime2.patch
https://sourceforge.net/tracker/?func=detail&aid=2807865&group_id=201579&atid=978130
libconcord-0.21-mime-type-def.patch:
Makefile.am | 22
Makefile.in | 281
aclocal.m4 |10632 ++++++++++--------
autom4te.cache/output.1 |28039 ++++++++++++++++++++----------------------------
autom4te.cache/output.2 |18176 +++++++++++++++++++++++++++++++
autom4te.cache/requests | 207
autom4te.cache/traces.1 | 365
autom4te.cache/traces.2 | 2376 ++++
config.guess | 51
config.h.in | 7
config.h.in~ | 58
config.sub | 54
configure |26101 ++++++++++++++++++--------------------------
configure.ac | 17
depcomp | 87
install-sh | 5
libconcord.xml | 15
ltmain.sh |13228 ++++++++++++----------
missing | 49
19 files changed, 57892 insertions(+), 41878 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 libconcord-0.21-mime-type-def.patchIndex: libconcord-0.21-mime-type-def.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libconcord/F-10/libconcord-0.21-mime-type-def.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libconcord-0.21-mime-type-def.patch 30 Jul 2009 18:32:28 -0000 1.1
+++ libconcord-0.21-mime-type-def.patch 31 Jul 2009 17:08:49 -0000 1.2
@@ -1,6 +1,6 @@
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
++++ concordance-0.21/libconcord/aclocal.m4 2009-07-31 12:49:14.000000000 -0400
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
@@ -11,7 +11,7 @@ diff -ruN concordance-0.21-orig/libconco
# 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 @@
+@@ -13,108 +13,194 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
@@ -20,3408 +20,11652 @@ diff -ruN concordance-0.21-orig/libconco
[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 @@
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++# 2006, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gordon Matzigkeit, 1996
++#
++# 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.
++
++m4_define([_LT_COPYING], [dnl
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++# 2006, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gordon Matzigkeit, 1996
++#
++# This file is part of GNU Libtool.
++#
++# GNU Libtool is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
++#
++# As a special exception to the GNU General Public License,
++# if you distribute this file as part of a program or library that
++# is built using GNU Libtool, you may include this file under the
++# same distribution terms that you use for the rest of that program.
++#
++# GNU Libtool is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with GNU Libtool; see the file COPYING. If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
++# obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++])
-# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
-+# serial 52 AC_PROG_LIBTOOL
-
-
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -645,6 +645,7 @@
- esac
- ;;
- *64-bit*)
-+ libsuff=64
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -1707,11 +1708,13 @@
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
- fi
++# serial 56 LT_INIT
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -1723,18 +1726,6 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
--netbsdelf*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='NetBSD ld.elf_so'
-- ;;
+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+-# -----------------------------------------------------------
+-# If this macro is not defined by Autoconf, define it here.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+- [],
+- [m4_define([AC_PROVIDE_IFELSE],
+- [m4_ifdef([AC_PROVIDE_$1],
+- [$2], [$3])])])
++# LT_PREREQ(VERSION)
++# ------------------
++# Complain and exit if this libtool version is less that VERSION.
++m4_defun([LT_PREREQ],
++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
++ [m4_default([$3],
++ [m4_fatal([Libtool version $1 or higher is required],
++ 63)])],
++ [$2])])
+
+
+-# AC_PROG_LIBTOOL
+-# ---------------
+-AC_DEFUN([AC_PROG_LIBTOOL],
+-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+- AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [AC_LIBTOOL_CXX],
+- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+- ])])
+-dnl And a similar setup for Fortran 77 support
+- AC_PROVIDE_IFELSE([AC_PROG_F77],
+- [AC_LIBTOOL_F77],
+- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+-])])
-
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -2516,7 +2507,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd* | netbsdelf*-gnu)
-+netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
-@@ -3523,7 +3514,7 @@
- ;;
- esac
- ;;
-- netbsd* | netbsdelf*-gnu)
-+ netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -5215,7 +5206,7 @@
- ;;
- esac
- ;;
-- netbsd* | netbsdelf*-gnu)
-+ netbsd*)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -5592,9 +5583,6 @@
- cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
- ;;
-- linux* | k*bsd*-gnu)
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-- ;;
- *)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -5803,13 +5791,12 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
[...112526 lines suppressed...]
+ NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -157,6 +182,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -6347,7 +107519,24 @@ diff -ruN concordance-0.21-orig/libconco
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
-@@ -220,6 +241,14 @@
+@@ -164,7 +190,7 @@
+ abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_F77 = @ac_ct_F77@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -195,6 +221,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -220,6 +247,14 @@
include_HEADERS = libconcord.h
libconcord_la_LDFLAGS = -version-info 1:0:0 -lusb
libconcord_la_LADD = usb
@@ -6362,7 +107551,7 @@ diff -ruN concordance-0.21-orig/libconco
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
-@@ -231,15 +260,15 @@
+@@ -231,15 +266,15 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -6383,7 +107572,7 @@ diff -ruN concordance-0.21-orig/libconco
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -255,9 +284,10 @@
+@@ -255,9 +290,10 @@
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: $(am__configure_deps)
@@ -6396,7 +107585,7 @@ diff -ruN concordance-0.21-orig/libconco
config.h: stamp-h1
@if test ! -f $@; then \
-@@ -269,7 +299,7 @@
+@@ -269,7 +305,7 @@
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(am__configure_deps)
@@ -6405,7 +107594,7 @@ diff -ruN concordance-0.21-orig/libconco
rm -f stamp-h1
touch $@
-@@ -278,20 +308,24 @@
+@@ -278,20 +314,24 @@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@@ -6439,7 +107628,7 @@ diff -ruN concordance-0.21-orig/libconco
done
clean-libLTLIBRARIES:
-@@ -321,31 +355,31 @@
+@@ -321,31 +361,31 @@
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -6477,7 +107666,7 @@ diff -ruN concordance-0.21-orig/libconco
mostlyclean-libtool:
-rm -f *.lo
-@@ -354,38 +388,61 @@
+@@ -354,38 +394,61 @@
-rm -rf .libs _libs
distclean-libtool:
@@ -6551,7 +107740,7 @@ diff -ruN concordance-0.21-orig/libconco
here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -393,36 +450,41 @@
+@@ -393,36 +456,41 @@
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -6602,7 +107791,7 @@ diff -ruN concordance-0.21-orig/libconco
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -438,21 +500,26 @@
+@@ -438,21 +506,26 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -6635,7 +107824,7 @@ diff -ruN concordance-0.21-orig/libconco
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
-@@ -465,6 +532,10 @@
+@@ -465,6 +538,10 @@
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
@@ -6646,7 +107835,7 @@ diff -ruN concordance-0.21-orig/libconco
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -493,6 +564,8 @@
+@@ -493,6 +570,8 @@
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
@@ -6655,7 +107844,7 @@ diff -ruN concordance-0.21-orig/libconco
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -504,9 +577,11 @@
+@@ -504,9 +583,11 @@
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
@@ -6668,7 +107857,7 @@ diff -ruN concordance-0.21-orig/libconco
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
-@@ -528,13 +603,15 @@
+@@ -528,13 +609,15 @@
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
@@ -6686,7 +107875,7 @@ diff -ruN concordance-0.21-orig/libconco
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
-@@ -553,9 +630,9 @@
+@@ -553,9 +636,9 @@
exit 1; } >&2
check-am: all-am
check: check-am
@@ -6698,7 +107887,7 @@ diff -ruN concordance-0.21-orig/libconco
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
-@@ -578,6 +655,7 @@
+@@ -578,6 +661,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -6706,7 +107895,7 @@ diff -ruN concordance-0.21-orig/libconco
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -600,26 +678,39 @@
+@@ -600,26 +684,39 @@
html: html-am
@@ -6748,7 +107937,7 @@ diff -ruN concordance-0.21-orig/libconco
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -642,27 +733,30 @@
+@@ -642,27 +739,30 @@
ps-am:
@@ -6793,7 +107982,7 @@ diff -ruN concordance-0.21-orig/libconco
# udev and friends support
-@@ -694,6 +788,17 @@
+@@ -694,6 +794,17 @@
$(MKDIR_P) $(DESTDIR)$(datarootdir)/hal/fdi/policy/10osvendor/
$(install_sh_DATA) libconcord.perms \
$(DESTDIR)$(datarootdir)/hal/fdi/policy/10osvendor/99-libconcord.perms
@@ -6813,7 +108002,7 @@ diff -ruN concordance-0.21-orig/libconco
.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
++++ concordance-0.21/libconcord/missing 2009-07-31 12:49:18.000000000 -0400
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
Index: libconcord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libconcord/F-10/libconcord.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libconcord.spec 30 Jul 2009 18:32:28 -0000 1.5
+++ libconcord.spec 31 Jul 2009 17:08:50 -0000 1.6
@@ -3,7 +3,7 @@
Name: libconcord
Version: 0.21
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Library to talk to Logitech Harmony universal remote controls
Group: Development/Libraries
@@ -173,6 +173,11 @@ update-mime-database %{_datadir}/mime &>
%changelog
+* Fri Jul 31 2009 Douglas E. Warner <silfreed at silfreed.net> 0.21-4
+- updating mime patch with different source:
+ http://stuff.onse.fi/concordance-mime2.patch
+ https://sourceforge.net/tracker/?func=detail&aid=2807865&group_id=201579&atid=978130
+
* Thu Jul 30 2009 Douglas E. Warner <silfreed at silfreed.net> 0.21-3
- adding a mime-type definition so other packages can handle them appropriately
(bug#506536)
More information about the scm-commits
mailing list