rpms/libconcord/devel libconcord-0.21-mime-type-def.patch, 1.1, 1.2 libconcord.spec, 1.7, 1.8
Douglas E. Warner
silfreed at fedoraproject.org
Wed Jun 17 20:15:58 UTC 2009
Author: silfreed
Update of /cvs/pkgs/rpms/libconcord/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28443
Modified Files:
libconcord-0.21-mime-type-def.patch libconcord.spec
Log Message:
* Wed Jun 17 2009 Douglas E. Warner <silfreed at silfreed.net> 0.21-4
- updated patch w/ autoreconf run
libconcord-0.21-mime-type-def.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -p -N -r 1.1 -r 1.2 libconcord-0.21-mime-type-def.patch
Index: 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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libconcord-0.21-mime-type-def.patch 17 Jun 2009 19:12:09 -0000 1.1
+++ libconcord-0.21-mime-type-def.patch 17 Jun 2009 20:15:56 -0000 1.2
@@ -1,6 +1,55232 @@
-diff -urP concordance/libconcord/configure.ac concordance_new/libconcord/configure.ac
---- concordance/libconcord/configure.ac 2009-03-08 11:52:41.000000000 -0700
-+++ concordance_new/libconcord/configure.ac 2009-06-17 10:44:32.546035768 -0700
+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
+@@ -21,7 +21,7 @@
+
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+-# 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
+
+ # 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'
+- ;;
+-
+ 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
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -6240,7 +6227,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ 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'
+- else
+- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+- as_echo_n_body='eval
+- arg=$1;
+- case $arg in
+- *"$as_nl"*)
+- expr "X$arg" : "X\\(.*\\)$as_nl";
+- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+- esac;
+- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+- '
+- export as_echo_n_body
+- as_echo_n='sh -c $as_echo_n_body as_echo'
+- fi
[...55070 lines suppressed...]
+ PACKAGE=libtool
+-VERSION="1.5.26 Debian 1.5.26-4"
++VERSION=1.5.26
+ TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+
+ # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+@@ -2135,10 +2135,7 @@
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link)
+- libs="$deplibs %DEPLIBS%"
+- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+- ;;
++ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ esac
+ fi
+ if test "$pass" = dlopen; then
+@@ -3272,11 +3269,6 @@
+ revision="$number_minor"
+ lt_irix_increment=no
+ ;;
+- *)
+- $echo "$modename: unknown library version type \`$version_type'" 1>&2
+- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit $EXIT_FAILURE
+- ;;
+ esac
+ ;;
+ no)
+diff -ruN concordance-0.21/libconcord/Makefile.am concordance-0.21-new/libconcord/Makefile.am
+--- concordance-0.21/libconcord/Makefile.am 2009-03-08 14:52:41.000000000 -0400
++++ concordance-0.21-new/libconcord/Makefile.am 2009-06-17 15:26:58.000000000 -0400
@@ -37,3 +37,25 @@
$(install_sh_DATA) libconcord.perms \
$(DESTDIR)$(datarootdir)/hal/fdi/policy/10osvendor/99-libconcord.perms
@@ -70,3 +55332,163 @@ diff -urP concordance/libconcord/Makefil
+ $(UPDATE_MIME_DATABASE) "$(datadir)/mime"; \
+ fi
+endif
+diff -ruN concordance-0.21/libconcord/Makefile.in concordance-0.21-new/libconcord/Makefile.in
+--- concordance-0.21/libconcord/Makefile.in 2009-03-08 15:07:50.000000000 -0400
++++ concordance-0.21-new/libconcord/Makefile.in 2009-06-17 15:28:02.000000000 -0400
+@@ -15,6 +15,7 @@
+ @SET_MAKE@
+
+
++
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -53,7 +54,8 @@
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(newmimedir)" \
++ "$(DESTDIR)$(includedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libconcord_la_LIBADD =
+@@ -86,6 +88,8 @@
+ $(LDFLAGS) -o $@
+ SOURCES = $(libconcord_la_SOURCES)
+ DIST_SOURCES = $(libconcord_la_SOURCES)
++newmimeDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(newmime_DATA)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS)
+ ETAGS = etags
+@@ -157,6 +161,7 @@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
++UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@
+ VERSION = @VERSION@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -220,6 +225,14 @@
+ include_HEADERS = libconcord.h
+ libconcord_la_LDFLAGS = -version-info 1:0:0 -lusb
+ libconcord_la_LADD = usb
++
++# MIME stuff
++newmimedir = $(datadir)/mime/packages
++newmime_DATA = libconcord.xml
++EXTRA_DIST = \
++ $(mime_DATA) \
++ $(newmime_DATA)
++
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+@@ -355,6 +368,23 @@
+
+ distclean-libtool:
+ -rm -f libtool
++install-newmimeDATA: $(newmime_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(newmimedir)" || $(MKDIR_P) "$(DESTDIR)$(newmimedir)"
++ @list='$(newmime_DATA)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f=$(am__strip_dir) \
++ echo " $(newmimeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(newmimedir)/$$f'"; \
++ $(newmimeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(newmimedir)/$$f"; \
++ done
++
++uninstall-newmimeDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(newmime_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(newmimedir)/$$f'"; \
++ rm -f "$(DESTDIR)$(newmimedir)/$$f"; \
++ done
+ install-includeHEADERS: $(include_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+@@ -553,9 +583,9 @@
+ exit 1; } >&2
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
++all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(newmimedir)" "$(DESTDIR)$(includedir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+@@ -604,7 +634,9 @@
+
+ info-am:
+
+-install-data-am: install-includeHEADERS
++install-data-am: install-includeHEADERS install-newmimeDATA
++ @$(NORMAL_INSTALL)
++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+ install-dvi: install-dvi-am
+
+@@ -642,9 +674,12 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
++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
+
+ .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
+ clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
+@@ -653,16 +688,17 @@
+ distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
+- install-includeHEADERS install-info install-info-am \
+- install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-includeHEADERS \
+- uninstall-libLTLIBRARIES
++ install-data install-data-am install-data-hook install-dvi \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-includeHEADERS install-info \
++ install-info-am install-libLTLIBRARIES install-man \
++ install-newmimeDATA install-pdf install-pdf-am install-ps \
++ install-ps-am install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++ uninstall-am uninstall-hook uninstall-includeHEADERS \
++ uninstall-libLTLIBRARIES uninstall-newmimeDATA
+
+
+ # udev and friends support
+@@ -694,6 +730,16 @@
+ $(MKDIR_P) $(DESTDIR)$(datarootdir)/hal/fdi/policy/10osvendor/
+ $(install_sh_DATA) libconcord.perms \
+ $(DESTDIR)$(datarootdir)/hal/fdi/policy/10osvendor/99-libconcord.perms
++
++install-data-hook:
++ 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
++
++uninstall-hook:
++ 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:
Index: libconcord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libconcord/devel/libconcord.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libconcord.spec 17 Jun 2009 19:12:09 -0000 1.7
+++ libconcord.spec 17 Jun 2009 20:15:57 -0000 1.8
@@ -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
@@ -174,6 +174,9 @@ update-mime-database %{_datadir}/mime &>
%changelog
+* Wed Jun 17 2009 Douglas E. Warner <silfreed at silfreed.net> 0.21-4
+- updated patch w/ autoreconf run
+
* Wed Jun 17 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 fedora-extras-commits
mailing list