diff --git a/.cvsignore b/.cvsignore index 9f7effe..038de20 100644 --- a/.cvsignore +++ b/.cvsignore @@ -10,3 +10,4 @@ kdegames-3.4.2-patched.tar.bz2 kdegames-3.4.91-patched.tar.bz2 kdegames-3.4.92-patched.tar.bz2 kdegames-3.5.0-patched.tar.bz2 +kdegames-3.5.1-patched.tar.bz2 diff --git a/kdegames.spec b/kdegames.spec index 6068417..1f41104 100644 --- a/kdegames.spec +++ b/kdegames.spec @@ -3,20 +3,23 @@ %define make_cvs 1 %define arts 1 -%define ksok 0 +%define redhatify 1 -%if %{ksok} -%define patch_name %{nil} -%else +%if %{redhatify} %define patch_name -patched +%else +%define patch_name %{nil} %endif %define qt_version 3.3.5 +%define qt_epoch 1 +%define kdelibs_epoch 6 +%define kdebase_epoch 6 %define disable_gcc_check_and_hidden_visibility 1 -Version: 3.5.0 -Release: 1.1 +Version: 3.5.1 +Release: 1 Epoch: 6 Summary: K Desktop Environment - Games Name: kdegames @@ -30,10 +33,9 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patc Patch: kde-libtool.patch Patch1: kdegames-3.1.1-konquest.patch -Requires: kdelibs >= 6:%{version} -Requires: kdebase >= 6:%{version} - -Prereq: /sbin/ldconfig +Requires: kdelibs >= %{kdelibs_epoch}:%{version} +Requires: kdebase >= %{kdebase_epoch}:%{version} +Requires(post,postun): /sbin/ldconfig BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -46,6 +48,7 @@ BuildRequires: glibc-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: libstdc++-devel +BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version} BuildRequires: perl %description @@ -58,7 +61,7 @@ ksnake, ksirtet, katomic, kjumpingcube, ktuberling. Summary: Development files for kdegames Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: kdebase-devel >= 6:%{version} +Requires: kdebase-devel >= %{kdebase_epoch}:%{version} %description devel Development files for the KDE gaming libraries. @@ -70,13 +73,6 @@ KDE desktop. %patch -p1 -b .libtool %patch1 -p1 -b .konquest -%if %{disable_gcc_check_and_hidden_visibility} - # disable gcc check - perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in - # disable hidden visibility - perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in -%endif - %if %{make_cvs} make -f admin/Makefile.common cvs %endif @@ -91,16 +87,25 @@ FLAGS="$RPM_OPT_FLAGS" CFLAGS="$FLAGS" \ CXXFLAGS="$FLAGS -fno-check-new" \ %configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ --disable-rpath \ +%if %{disable_gcc_check_and_hidden_visibility} + --disable-gcc-hidden-visibility \ +%endif %if %{arts} == 0 --without-arts \ %endif -%%ifarch s390 s390x +%ifarch s390 s390x --disable-pie \ %endif %if %{final} --enable-final \ %endif +%if %{debug} == 0 + --disable-debug \ + --disable-warnings \ +%endif --includedir=%{prefix}/include/kde \ --with-qt-libraries=$QTDIR/lib @@ -111,8 +116,6 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -make -C klickety install DESTDIR=$RPM_BUILD_ROOT - # Make symlinks relative pushd $RPM_BUILD_ROOT/usr/share/doc/HTML/en for i in *; do @@ -150,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/kde/* %changelog +* Fri Feb 03 2006 Than Ngo 6:3.5.1-1 +- 3.5.1 + * Fri Dec 09 2005 Jesse Keating - rebuilt diff --git a/sources b/sources index e91dc49..6547db4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cba7f49b36b74954c6bc3226d3912201 kdegames-3.5.0-patched.tar.bz2 +fb44a24d646801989a4e7e837e628c00 kdegames-3.5.1-patched.tar.bz2