rpms/gnucash/devel qof.patch,NONE,1.1 gnucash.spec,1.27,1.28
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 4 06:42:46 UTC 2006
Author: notting
Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19210
Modified Files:
gnucash.spec
Added Files:
qof.patch
Log Message:
fix qof conflict by moving libs out of the way
qof.patch:
configure | 2 -
lib/libqof/backend/file/Makefile.in | 48 ++++++++++++++++++------------------
lib/libqof/qof/Makefile.in | 46 +++++++++++++++++-----------------
3 files changed, 48 insertions(+), 48 deletions(-)
--- NEW FILE qof.patch ---
--- gnucash-1.9.3/lib/libqof/qof/Makefile.in.qof 2006-04-04 01:42:17.000000000 -0400
+++ gnucash-1.9.3/lib/libqof/qof/Makefile.in 2006-04-04 01:45:37.000000000 -0400
@@ -63,8 +63,8 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qofincludedir)" \
"$(DESTDIR)$(qofincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libqof_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(top_builddir)/lib/libc/libc-missing.la
@@ -433,7 +433,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-lib_LTLIBRARIES = libqof.la
+pkglib_LTLIBRARIES = libqof.la
libqof_la_LDFLAGS = -version-info $(LIBQOF_LIBRARY_VERSION)
libqof_la_LIBADD = \
$(GLIB_LIBS) \
@@ -556,35 +556,35 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
else :; fi; \
done
-uninstall-libLTLIBRARIES:
+uninstall-pkglibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ @set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
done
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-pkglibLTLIBRARIES:
+ -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libqof.la: $(libqof_la_OBJECTS) $(libqof_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libqof_la_LDFLAGS) $(libqof_la_OBJECTS) $(libqof_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(pkglibdir) $(libqof_la_LDFLAGS) $(libqof_la_OBJECTS) $(libqof_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -760,7 +760,7 @@
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qofincludedir)" "$(DESTDIR)$(qofincludedir)"; do \
+ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(qofincludedir)" "$(DESTDIR)$(qofincludedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -792,7 +792,7 @@
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-pkglibLTLIBRARIES clean-libtool \
mostlyclean-am
distclean: distclean-am
@@ -814,7 +814,7 @@
install-data-am: install-nodist_qofincludeHEADERS \
install-qofincludeHEADERS
-install-exec-am: install-libLTLIBRARIES
+install-exec-am: install-pkglibLTLIBRARIES
install-info: install-info-am
@@ -840,22 +840,22 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES \
uninstall-nodist_qofincludeHEADERS uninstall-qofincludeHEADERS
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool ctags distclean \
+ clean-pkglibLTLIBRARIES clean-libtool ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am \
- install-libLTLIBRARIES install-man \
+ install-pkglibLTLIBRARIES install-man \
install-nodist_qofincludeHEADERS install-qofincludeHEADERS \
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-info-am uninstall-libLTLIBRARIES \
+ uninstall-info-am uninstall-pkglibLTLIBRARIES \
uninstall-nodist_qofincludeHEADERS uninstall-qofincludeHEADERS
--- gnucash-1.9.3/configure.qof 2006-03-19 21:55:17.000000000 -0500
+++ gnucash-1.9.3/configure 2006-04-04 00:21:20.000000000 -0400
@@ -26023,7 +26023,7 @@
echo "$as_me: External QOF Disabled. Using Internal QOF Code." >&6;}
fi
if test x$QOF_XML_DIR = x; then
- QOF_LIB_DIR='${libdir}'
+ QOF_LIB_DIR='${libdir}/gnucash'
QOF_CFLAGS='-I${top_builddir}/lib/libqof/qof -I${top_srcdir}/lib/libqof/qof'
QOF_LIBS='${top_builddir}/lib/libqof/qof/libqof.la'
QOF_VERSION="internal"
--- gnucash-1.9.3/lib/libqof/backend/file/Makefile.in.foo 2006-04-04 02:08:33.000000000 -0400
+++ gnucash-1.9.3/lib/libqof/backend/file/Makefile.in 2006-04-04 02:09:27.000000000 -0400
@@ -59,9 +59,9 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qsfschemadir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(qsfschemadir)"
+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libqof_backend_qsf_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -433,7 +433,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = .
-lib_LTLIBRARIES = libqof-backend-qsf.la
+pkglib_LTLIBRARIES = libqof-backend-qsf.la
AM_CFLAGS = \
-I.. -I../.. \
-DLOCALE_DIR=\""$(datadir)/locale"\" \
@@ -500,35 +500,35 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
else :; fi; \
done
-uninstall-libLTLIBRARIES:
+uninstall-pkglibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ @set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
done
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-pkglibLTLIBRARIES:
+ -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libqof-backend-qsf.la: $(libqof_backend_qsf_la_OBJECTS) $(libqof_backend_qsf_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libqof_backend_qsf_la_LDFLAGS) $(libqof_backend_qsf_la_OBJECTS) $(libqof_backend_qsf_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(pkglibdir) $(libqof_backend_qsf_la_LDFLAGS) $(libqof_backend_qsf_la_OBJECTS) $(libqof_backend_qsf_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -768,7 +768,7 @@
all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qsfschemadir)"; do \
+ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(qsfschemadir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -799,7 +799,7 @@
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-recursive
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-pkglibLTLIBRARIES clean-libtool \
mostlyclean-am
distclean: distclean-recursive
@@ -820,7 +820,7 @@
install-data-am: install-qsfschemaDATA
-install-exec-am: install-libLTLIBRARIES
+install-exec-am: install-pkglibLTLIBRARIES
install-info: install-info-recursive
@@ -846,26 +846,26 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES \
uninstall-qsfschemaDATA
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-libLTLIBRARIES clean-libtool \
+ clean clean-generic clean-pkglibLTLIBRARIES clean-libtool \
clean-recursive ctags ctags-recursive distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-recursive distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \
- install-info-am install-libLTLIBRARIES install-man \
+ install-info-am install-pkglibLTLIBRARIES install-man \
install-qsfschemaDATA install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic maintainer-clean-recursive \
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am \
- uninstall-libLTLIBRARIES uninstall-qsfschemaDATA
+ uninstall-pkglibLTLIBRARIES uninstall-qsfschemaDATA
qsf-dir.h: qsf-dir.h.in Makefile
Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnucash.spec 27 Mar 2006 21:47:16 -0000 1.27
+++ gnucash.spec 4 Apr 2006 06:42:44 -0000 1.28
@@ -8,7 +8,7 @@
%if %{buildsvn}
Release: 1.svn%{svnrev}.1
%else
-Release: 1
+Release: 2
%endif
License: GPL/GFDL
Group: Applications/Productivity
@@ -23,6 +23,7 @@
Patch3: gnucash-1.8.11-icon.patch
Patch4: gnucash-1.8.6-64bit-fixes.patch
Patch5: gnucash-1.8.12-aq.patch
+Patch6: qof.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: g-wrap-devel >= 1.3.2, gtkhtml3-devel
BuildRequires: libgsf-devel >= 1.12.2
@@ -52,6 +53,7 @@
#%patch3 -p1 -b .icon
%patch4 -p1 -b .64bit
#%patch5 -p1 -b .aq
+%patch6 -p1 -b .qof
%build
%if %{buildsvn}
@@ -136,6 +138,9 @@
%doc doc/README.german doc/README.francais doc/guile-hackers.txt
%changelog
+* Tue Apr 4 2006 Bill Nottingham <notting at redhat.com> - 1.9.3-2
+- fix conflict with qof (#187267)
+
* Mon Mar 27 2006 Bill Nottingham <notting at redhat.com> - 1.9.3-1
- update to 1.9.x
More information about the fedora-cvs-commits
mailing list