diff --git a/krecipes-gcc4.patch b/krecipes-gcc4.patch deleted file mode 100644 index 22e26c1..0000000 --- a/krecipes-gcc4.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- kmymoney2-0.7.4/configure 2005-07-18 10:49:10.000000000 -0500 -+++ kmymoney2-0.7.4.temp/configure 2005-07-24 11:49:09.000000000 -0500 -@@ -4230,93 +4230,6 @@ - - - -- echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5 --echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6 -- -- -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --#ifdef __GNUC__ --#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 --choke me --#endif --#endif -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- kde_bad_compiler=no --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --kde_bad_compiler=yes -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- -- echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5 --echo "${ECHO_T}$kde_bad_compiler" >&6 -- --if test "$kde_bad_compiler" = "yes"; then -- { { echo "$as_me:$LINENO: error: -- --This particular compiler version is blacklisted because it --is known to miscompile KDE. Please use a newer version, or --if that is not yet available, choose an older version. -- --Please do not report a bug or bother us reporting this --configure error. We know about it, and we introduced --it by intention to avoid untraceable bugs or crashes in KDE. -- --" >&5 --echo "$as_me: error: -- --This particular compiler version is blacklisted because it --is known to miscompile KDE. Please use a newer version, or --if that is not yet available, choose an older version. -- --Please do not report a bug or bother us reporting this --configure error. We know about it, and we introduced --it by intention to avoid untraceable bugs or crashes in KDE. -- --" >&2;} -- { (exit 1); exit 1; }; } --fi -- -- - - if test "$GXX" = "yes" || test "$CXX" = "KCC"; then - if test "$kde_use_debug_code" != "no"; then diff --git a/krecipes.spec b/krecipes.spec index 520ae15..1c6c5aa 100644 --- a/krecipes.spec +++ b/krecipes.spec @@ -1,6 +1,6 @@ Name: krecipes Version: 0.9.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity @@ -13,8 +13,9 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: kdelibs3-devel BuildRequires: sqlite-devel +BuildRequires: mysql-devel +BuildRequires: postgresql-devel -Patch0: krecipes-gcc4.patch Patch1: krecipes-X11.patch Patch2: krecipes-0.9.1-gcc43.patch @@ -27,12 +28,10 @@ your menu/diet in advance. %prep %setup -q -## Neither patch0 or patch1 should be required anymore -- Rex -#patch0 -p1 -b .gcc4 # autoconf tools check for X is a file in libXt-devel and Xt lib # we dont use or link against libXt so rather than adding an extra # BuildRequires I patched configure to look for something thats there -#patch1 -p1 -b .X11 +%patch1 -p1 -b .X11 %patch2 -p1 -b .gcc43 @@ -42,8 +41,9 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh %configure \ --disable-rpath \ - --without-mysql \ - --without-postgresql + --with-mysql \ + --with-postgresql \ + --with-sqlite make %{?_smp_mflags} @@ -97,6 +97,10 @@ touch --no-create %{_datadir}/icons/crystalsvg || : %{_datadir}/mimelnk/*/*.desktop %changelog +* Tue Jun 16 2009 Rex Dieter - 0.9.1-11 +- re-enable mysql/postgresql support +- re-enable mostly harmless X11 patch + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild