From 3d2d0e7e46fc979e518b4a31ac50d275ea82d637 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:50:29 +0000 Subject: auto-import kdemultimedia-2.2.2-1 from kdemultimedia-2.2.2-1.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 54ff5b8..5086189 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ brahms-1.01.tar.bz2 -kdemultimedia-2.2.tar.bz2 +kdemultimedia-2.2.2.tar.bz2 diff --git a/kdemultimedia.spec b/kdemultimedia.spec index d03d8e7..f8b64cd 100644 --- a/kdemultimedia.spec +++ b/kdemultimedia.spec @@ -3,22 +3,23 @@ %define DATE 20010806 %define is_release 1 %define beta %{nil} -%define rel 5 -Version: 2.2 +%define rel 1 +%define __libtoolize /bin/true +Version: 2.2.2 Name: kdemultimedia Obsoletes: aktion Prefix: /usr %if %{is_release} %if "%{beta}" != "" -Release: 1.%{beta}.%{rel} +Release: 0.%{beta}.%{rel} Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{version}-%{beta}.tar.bz2 %else Release: %{rel} Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{version}.tar.bz2 %endif %else -Release: 1.cvs%{DATE}.%{rel} +Release: 0.cvs%{DATE}.%{rel} Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{DATE}.tar.bz2 %endif Source1: http://brahms.sourceforge.net/download/brahms-1.01.tar.bz2 @@ -28,7 +29,6 @@ Epoch: 6 Patch1: kdemultimedia-2.2-redhat.patch Patch2: kdemultimedia-2.1-glibc-2.2.2.patch Patch3: kdemultimedia-2.2-brahms.patch -Patch4: kdemultimedia-2.2-cvsfixes.patch Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-buildroot License: GPL @@ -46,6 +46,7 @@ player. %package devel Summary: Development files for kdemultimedia. Group: Development/Libraries +Requires: %{name} = %{version}-%{release} %description devel Development files for kdemultimedia @@ -64,7 +65,6 @@ rm -rf $RPM_BUILD_ROOT perl -pi -e "s,examples,,g" kmid/Make* %patch1 -p1 -b .redhat %patch2 -p1 -b .glibc222 -%patch4 -p1 -b .cvs perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in # remove aktion @@ -103,8 +103,10 @@ LANG=C make -C doc DIR=`pwd` cd brahms-1.01 CFLAGS="$FLAGS" CXXFLAGS="$FLAGS -fno-check-new" \ +LDFLAGS="-L$DIR/arts/midi -L$DIR/arts/modules -L$DIR/arts/gui/kde -L$DIR/arts/runtime" \ ./configure --prefix=%{prefix} \ --without-alsa +find . -name "Makefile*" |xargs perl -pi -e "s,\.libs/\.libs,.libs,g" make cd .. @@ -171,8 +173,15 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Sep 12 2001 Tim Powers -- rebuild with new gcc and binutils +* Thu Nov 15 2001 Bernhard Rosenkraenzer 2.2.2-1 +- 2.2.2 +- make sure this builds without a previous installation of kdemultimedia + +* Mon Sep 17 2001 Bernhard Rosenkraenzer 2.2.1-2 +- -devel requires base + +* Sat Sep 15 2001 Bernhard Rosenkraenzer 2.2.1-1 +- 2.2.1 * Thu Aug 23 2001 Bernhard Rosenkraenzer 2.2-4 - Rebuild to fix bug #51975 diff --git a/sources b/sources index d6d6865..666e0e5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ fcfb3f35663f859c016066eb0b5d2023 brahms-1.01.tar.bz2 -530a05d3671aaf093805083658dd8030 kdemultimedia-2.2.tar.bz2 +76981ca284663093cd0bc37500e10441 kdemultimedia-2.2.2.tar.bz2