rpms/krecipes/devel krecipes-gcc4.patch, NONE, 1.1 krecipes.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Sat Jul 30 17:23:14 UTC 2005
Author: ausil
Update of /cvs/extras/rpms/krecipes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2003/devel
Modified Files:
.cvsignore sources
Added Files:
krecipes-gcc4.patch krecipes.spec
Log Message:
auto-import krecipes-0.8.1-1.fc4 on branch devel from krecipes-0.8.1-1.fc4.src.rpm
krecipes-gcc4.patch:
--- NEW FILE krecipes-gcc4.patch ---
--- 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
--- NEW FILE krecipes.spec ---
Name: krecipes
Version: 0.8.1
Release: 1%{?dist}
Summary: Krecipes: Your Way to Cook with Tux!
Group: Applications/Productivity
License: GPL
URL: http://krecipes.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/krecipes/krecipes-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdelibs-devel > 3.1, sqlite-devel
Requires: kdebase >= 3.1, qt-MySQL, qt-PostgreSQL, sqlite
patch0: krecipes-gcc4.patch
%description
Krecipes is a program that lets you to manage your
recipes, create shopping lists, choose a recipe based
on available ingredients and plan your menu/diet in advance.
Supports MySQL, Postgres and sqlite backends.
%prep
%setup -q
%patch0 -p1 -b .gcc4
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
%configure --disable-rpath
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--vendor=fedora \
--add-category=X-Fedora \
--add-category=Application \
--add-category=Utility \
--add-category=KDE \
--add-category=Qt \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/krecipes.desktop
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
lang=$(basename $lang_dir)
echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang
done
fi
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc
%{_bindir}/krecipes
%{_datadir}/applications/fedora-krecipes.desktop
%{_datadir}/apps/krecipes
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Sun Jul 24 2005 <dennis at ausil.us> - 0.8.1-1%{?dist}
- Initial build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Jul 2005 17:21:16 -0000 1.1
+++ .cvsignore 30 Jul 2005 17:23:12 -0000 1.2
@@ -0,0 +1 @@
+krecipes-0.8.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Jul 2005 17:21:16 -0000 1.1
+++ sources 30 Jul 2005 17:23:12 -0000 1.2
@@ -0,0 +1 @@
+f9049384bad2139f049b9b4eadd7239a krecipes-0.8.1.tar.gz
More information about the scm-commits
mailing list