diff --git a/.cvsignore b/.cvsignore index b6428b3..71635ab 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ kdeaddons-3.3.0.tar.bz2 kdeaddons-3.3.1.tar.bz2 kdeaddons-3.3.2.tar.bz2 kdeaddons-3.4.0-rc1.tar.bz2 +kdeaddons-3.4.0.tar.bz2 diff --git a/kdeaddons.spec b/kdeaddons.spec index b3e11c8..b34cdb0 100644 --- a/kdeaddons.spec +++ b/kdeaddons.spec @@ -8,19 +8,20 @@ %define arts 1 Version: 3.4.0 -Release: 0.rc1.2 +Release: 1 Name: kdeaddons Summary: K Desktop Environment - Plugins Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot License: GPL -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-rc1.tar.bz2 -Patch0: admin-visibility.patch +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch1: kde-libtool.patch Patch2: kdeaddons-3.3.92-vimpart.patch Patch3: kdeaddons-3.3.92-db++.patch Patch4: kdeaddons-3.4.0-cast.patch +# gcc4 workaround +Patch100: admin-visibility.patch Prereq: /sbin/ldconfig @@ -67,7 +68,6 @@ This package includes a applet to control mediaplayers. %prep %setup -q -%patch0 -p1 -b .gcc %patch1 -p1 -b .libtool %if !%{vimpart} @@ -76,6 +76,7 @@ rm -rf vimpart %endif %patch3 -p1 -b .db++ %patch4 -p1 -b .cast +%patch100 -p1 -b .gcc4 %if %{libtool} make -f admin/Makefile.common cvs @@ -85,8 +86,8 @@ rm -rf vimpart unset QTDIR || : ; . /etc/profile.d/qt.sh export KDEDIR=%{prefix} -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -fno-use-cxa-atexit" -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG" +export CXXFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS" %configure \ --includedir=%{_includedir}/kde \ @@ -210,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/kde3/mediacontrol_panelapplet* %changelog +* Thu Mar 17 2005 Than Ngo 3.4.0-1 +- 3.4.0 release + * Sun Mar 06 2005 Than Ngo 3.4.0-0.rc1.2 - rebuilt against gcc-4 diff --git a/sources b/sources index fefd205..2229da7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -500444d8846d3829e5e4ff964b0b12b2 kdeaddons-3.4.0-rc1.tar.bz2 +bd93150a8c11b01d779cae347f99e2cb kdeaddons-3.4.0.tar.bz2