From 639695479ae1ad6a355adebf18b53a6fd0775158 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:44:50 +0000 Subject: auto-import changelog data from kdeedu-3.1-2.src.rpm Fri Feb 21 2003 Than Ngo 3.1-2 - get rid of gcc path from dependency_libs Tue Jan 28 2003 Than Ngo 3.1-1 - 3.1 release - remove some unneeded macros Thu Jan 23 2003 Tim Powers 3.1-0.5 - rebuild Tue Jan 14 2003 Thomas Woerner 3.1-0.4 - rc6 - removed size_t check - excluded ia64 --- diff --git a/kdeedu.spec b/kdeedu.spec index ef9d9b6..11de49c 100644 --- a/kdeedu.spec +++ b/kdeedu.spec @@ -1,15 +1,5 @@ -%define build_release 0 -%define build_beta 1 -%define build_snapshot 2 - -%define isClean 1 - -%define isBuild %{build_release} - %define debug 0 -%define release_number 0.2 - %define build_for_ftp 0 %define strip_bin 0 @@ -19,46 +9,34 @@ %define desktop_file 1 %define desktop_file_utils_version 0.2.93 -%define _missing_doc_files_terminate_build 0 -%define _unpackaged_files_terminate_build 0 - -%define qt_version 3.1.0 +%define qt_version 3.1.1 Name: kdeedu Version: 3.1 +Release: 2 Summary: Educational/Edutainment applications for KDE URL: http://www.kde.org/ License: GPL Group: User Interface/Desktops Prefix: %{_prefix} -%if "%{isBuild}" == "%{build_release}" -%define release_name %{nil} -Release: %{release_number} -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{version}.tar.bz2 -%endif - -%if "%{isBuild}" == "%{build_beta}" -%define release_name beta1 -Release: 0.%{release_name}.%{release_number} -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{release_name}.tar.bz2 -%endif - -%if "%{isBuild}" == "%{build_snapshot}" -%define release_name 20020807 -Release: 0.%{release_name}cvs.%{release_number} -Source: cvs://cvs.kde.org/%{name}-%{release_name}.tar.bz2 -%endif +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch: kdeedu-3.1-xjdxgen.patch Patch1: kdeedu-3.1-dt.patch +Patch2: kde-libtool.patch %if %{build_for_ftp} ExclusiveArch: %{ix86} %endif -BuildPrereq: kdebase-devel >= %{version} -BuildPrereq: qt-devel >= %{qt_version} +Requires: kdebase >= 6:%{version}-6 +Requires: kdelibs >= 6:%{version}-6 +Requires: qt >= 1:%{qt_version} + +BuildRequires: kdebase-devel >= %{version}-1 +BuildRequires: kdelibs-devel >= %{version}-1 +BuildRequires: qt-devel >= %{qt_version} %if %{desktop_file} BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version} @@ -144,21 +122,18 @@ Group: User Interface/Desktops Vocabulary Trainer %prep -%if "%{isBuild}" == "%{build_release}" %setup -q -%else -%setup -q -n %{name}-%{version}-%{release_name} -%endif %patch -p1 -b .xjdxgen %patch1 -p1 -b .dt +%patch2 -p1 -b .libtool %build unset QTDIR || : ; . /etc/profile.d/qt.sh -[ -e configure ] || make -f Makefile.cvs %configure \ --includedir=%{_includedir}/kde \ - --with-qt-libraries=$QTDIR/lib + --with-qt-libraries=$QTDIR/lib \ + --enable-final make %{?_smp_mflags} @@ -175,35 +150,49 @@ desktop-file-install --vendor kde \ --add-category "Application;Education;X-Red-Hat-Extra" \ $RPM_BUILD_ROOT%{_datadir}/applnk/Edutainment/*/*.desktop -rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk +rm -rfv $RPM_BUILD_ROOT%{_datadir}/applnk %endif %clean -%if %{rpm_clean} rm -rf $RPM_BUILD_ROOT -%endif %files %defattr(-,root,root) %doc %{_docdir}/HTML/en/* - %{_bindir}/* %{_libdir}/* - %if %{desktop_file} %{_datadir}/applications/* %else %{_datadir}/applnk/Edutainment %endif - %{_datadir}/apps/* %{_datadir}/mimelnk/application/* %{_datadir}/icons/*/*/*/* %files devel +%defattr(-,root,root) %{_includedir}/kde/* %changelog +* Fri Feb 21 2003 Than Ngo 3.1-2 +- get rid of gcc path from dependency_libs + +* Tue Jan 28 2003 Than Ngo 3.1-1 +- 3.1 release +- remove some unneeded macros + +* Thu Jan 23 2003 Tim Powers 3.1-0.5 +- rebuild + +* Tue Jan 14 2003 Thomas Woerner 3.1-0.4 +- rc6 +- removed size_t check +- excluded ia64 + +* Sun Dec 1 2002 Than Ngo 3.1-0.3 +- add missing defattr + * Fri Nov 29 2002 Than Ngo 3.1-0.2 - get rid of sub packages - desktop issues diff --git a/sources b/sources index 6ba2ca6..41b99e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f63a2d65c376854832561273f310f82d kdeedu-3.1.tar.bz2 +ed587675e6b4a18a416c05e0a106e8a7 kdeedu-3.1.tar.bz2