diff --git a/.cvsignore b/.cvsignore index 40536ea..251baa6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdegraphics-3.2.3.tar.bz2 +kdegraphics-3.3.0-rc2.tar.bz2 diff --git a/kdegraphics.spec b/kdegraphics.spec index 004b977..d661fe6 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -1,14 +1,14 @@ %define debug 0 %define final 0 -%define kpovmodeler 1 - +%define kpovmodeler 0 %define kfract 0 +%define arts 1 %define no_scanner_archs s390 s390x -Version: 3.2.3 -Release: 1 +Version: 3.3.0 +Release: 0.1.rc2 Name: kdegraphics Summary: K Desktop Environment - Graphics Applications Epoch: 7 @@ -16,7 +16,7 @@ Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-buildroot License: GPL -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-rc2.tar.bz2 Patch0: kde-libtool.patch %ifarch %{scanner_archs} @@ -27,7 +27,7 @@ BuildRequires: gphoto2-devel %if %{kpovmodeler} BuildRequires: freeglut-devel %endif -BuildRequires: kdebase-devel >= 3.2.1 +BuildRequires: kdebase-devel >= %{version} BuildRequires: zlib-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -40,42 +40,6 @@ Requires: kdebase >= 6:%{version} Prereq: /sbin/ldconfig -Obsoletes: kamera -Obsoletes: kcoloredit -Obsoletes: kdvi -Obsoletes: kfax -Obsoletes: kfile-pdf -Obsoletes: kfile-png -Obsoletes: kfract -Obsoletes: kghostview -Obsoletes: kiconedit -Obsoletes: kooka -Obsoletes: kpaint -Obsoletes: kruler -Obsoletes: ksnapshot -Obsoletes: kuickshow -Obsoletes: kview -Obsoletes: kviewshell -Obsoletes: libkscan - -Provides: kamera -Provides: kcoloredit -Provides: kdvi -Provides: kfax -Provides: kfile-pdf -Provides: kfile-png -Provides: kfract -Provides: kghostview -Provides: kiconedit -Provides: kooka -Provides: kpaint -Provides: kruler -Provides: ksnapshot -Provides: kuickshow -Provides: kview -Provides: kviewshell -Provides: libkscan - %description Graphics applications for the K Desktop Environment. @@ -98,12 +62,6 @@ Summary: Development files for kdegraphics Requires: %{name} = %{epoch}:%{version}-%{release} Group: Development/Libraries -Obsoletes: kviewshell-devel -Obsoletes: libkscan-devel - -Provides: kviewshell-devel -Provides: libkscan-devel - %description devel Graphic applications for the K Desktop Environment. This package contains header files for developing applications using kdegraphics. @@ -309,13 +267,16 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh %configure \ --with-qt-libraries=$QTDIR/lib \ --disable-rpath \ +%if %{arts} == 0 + --without-arts \ +%endif %if %{final} --enable-final \ %endif --includedir=/usr/include/kde \ --with-xinerama \ %ifnarch %{no_scanner_archs} - --with-kamera \ +--with-kamera \ %else --without-kamera %endif @@ -359,7 +320,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/apps/* %{_datadir}/mimelnk/text/* %{_datadir}/applications/kde/* -%{_datadir}/applnk/.hidden/* %{_datadir}/applnk/* %files devel @@ -367,6 +327,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/kde/* %changelog +* Tue Aug 10 2004 Than Ngo 3.3.0-0.1.rc2 +- update to 3.3.0 rc2 + * Mon Jun 21 2004 Than Ngo 7:3.2.3-1 - update to 3.2.3 diff --git a/sources b/sources index 34643fa..e2fc187 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af7092f2afc5a8565eb5017ecee6b67e kdegraphics-3.2.3.tar.bz2 +ffe8d9343c9074970be3d9732c0d447b kdegraphics-3.3.0-rc2.tar.bz2