commit krename for openSUSE:Factory
Hello community, here is the log from the commit of package krename for openSUSE:Factory checked in at 2014-09-03 18:23:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krename (Old) and /work/SRC/openSUSE:Factory/.krename.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "krename" Changes: -------- --- /work/SRC/openSUSE:Factory/krename/krename.changes 2012-12-03 09:48:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.krename.new/krename.changes 2014-09-03 20:09:27.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Mar 9 13:15:52 UTC 2014 - tittiatcoke@gmail.com + +- Add patch fix-freetype2-includes.patch to ensure that the right + freetype2 includes are found + +------------------------------------------------------------------- New: ---- fix-freetype2-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krename.spec ++++++ --- /var/tmp/diff_new_pack.CpIaH2/_old 2014-09-03 20:09:28.000000000 +0200 +++ /var/tmp/diff_new_pack.CpIaH2/_new 2014-09-03 20:09:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package krename # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,8 @@ Patch2: krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch # PATCH-FIX-UPSTREAM remove-gplv2-code.diff dmueller@suse.de -- Remove GPLv2 only code (only used for self-testing) Patch3: remove-gplv2-code.diff +# PATCH-FIX-openSUSE tittiatcokeægmail.com -- make sure that the freetype includes are found +Patch4: fix-freetype2-includes.patch BuildRequires: freetype2-devel BuildRequires: libexiv2-devel BuildRequires: libkde4-devel @@ -61,6 +63,9 @@ # GPLv2 only code, not really needed, lets avoid the license discussion rm -rf src/modeltest.* %patch3 +%if 0%{?suse_version} > 1310 +%patch4 -p1 +%endif # Remove build time references so build-compare can do its work (fix rpmlint warning "file-contains-date-and-time") FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') ++++++ fix-freetype2-includes.patch ++++++ diff -urB krename-4.0.9/src/CMakeLists.txt new/src/CMakeLists.txt --- krename-4.0.9/src/CMakeLists.txt 2010-09-26 08:50:36.000000000 +0200 +++ new/src/CMakeLists.txt 2014-03-09 14:22:06.732181180 +0100 @@ -18,7 +18,7 @@ ENDIF(LIBPODOFO_FOUND) IF(FREETYPE_FOUND) - INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIR} ) + INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIR} "/usr/include/freetype2" ) ENDIF(FREETYPE_FOUND) ADD_DEFINITIONS(${TAGLIB_CFLAGS} ${EXIV2_CFLAGS} ${LIBPODOFO_CFLAGS} ${KDE4_DEFINITIONS} ) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de