From a8451c1b66395f4e40d6589e34ec37eaf13e83c0 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:53:08 +0000 Subject: auto-import kdemultimedia-3.0.5a-1 from kdemultimedia-3.0.5a-1.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 9b44253..a2a5f71 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdemultimedia-3.0.3.tar.bz2 +kdemultimedia-3.0.5a-patched.tar.bz2 diff --git a/kdemultimedia.spec b/kdemultimedia.spec index d88ec59..c98e092 100644 --- a/kdemultimedia.spec +++ b/kdemultimedia.spec @@ -1,59 +1,90 @@ +%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 1 + +%define build_for_ftp 0 + +%define buildbrahms 0 + %define strip_bin 0 %define final 0 %define rpm_clean 1 + %define desktop_file 1 %define desktop_file_utils_version 0.2.93 %define my_vendor kde -%define sourcedir stable/%{version}/distribution/tar/generic/source -%define pkg kdemultimedia -%define DATE 20020327 -%define is_release 1 -%define beta %{nil} -%define rel 4 -%define buildbrahms 0 -Version: 3.0.3 + +%define build_mpeglib 0 +%define libtool 1 + +Version: 3.0.5a Name: kdemultimedia Obsoletes: aktion Prefix: /usr -%if %{is_release} -%if "%{beta}" != "" -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}%{beta}.tar.bz2 -%endif -%else -Release: 0.cvs%{DATE}.%{rel} -Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{DATE}.tar.bz2 -%endif -%if %buildbrahms -Source1: http://brahms.sourceforge.net/download/brahms-%{DATE}.tar.bz2 -%endif Icon: kde-icon.xpm Summary: Multimedia applications for the K Desktop Environment (KDE). Epoch: 6 -Patch1: kdemultimedia-2.2-redhat.patch -Patch2: kdemultimedia-2.1-glibc-2.2.2.patch -Patch3: brahms-20020107-kdemultimedia.patch -Patch4: kdemultimedia-3.0.2-desktop.patch Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-buildroot License: GPL + +%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}-patched.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 + +%if %{build_for_ftp} +ExclusiveArch: %{ix86} +%endif ExcludeArch: alpha + +%if %{buildbrahms} +Source1: http://brahms.sourceforge.net/download/brahms-20021012.tar.bz2 +%endif +Source900: gccver.c + +Patch1: kdemultimedia-2.2-redhat.patch +Patch2: kdemultimedia-2.1-glibc-2.2.2.patch +Patch3: brahms-20020107-kdemultimedia.patch +Patch4: kdemultimedia-3.0.4-desktop.patch +Patch5: kdemultimedia-3.0.4-debug.patch + Prereq: /sbin/ldconfig + BuildRequires: qt-devel BuildRequires: zlib-devel BuildRequires: XFree86-devel -BuildRequires: kdelibs-devel >= 3.0.0-10 -BuildRequires: kdebase-devel >= 3.0.0-10 +BuildRequires: kdelibs-devel >= 3.0.3 +BuildRequires: kdebase-devel >= 3.0.3 BuildRequires: libjpeg-devel BuildRequires: gcc-c++ BuildRequires: glibc-devel +BuildRequires: perl + %if %{desktop_file} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} %endif -Source900: gccver.c %description The K Desktop Environment (KDE) is a GUI desktop for the X Window @@ -66,7 +97,11 @@ player. Summary: Additional functionality for the aRts sound system Group: Applications/Multimedia Obsoletes: kdemultimedia +%if ! %{build_mpeglib} +Obsoletes: kdemultimedia-libs +%else Requires: %{name}-libs +%endif %description arts Additional functionality for the aRts sound system. @@ -77,7 +112,11 @@ synthesizers. %package devel Summary: Development files for aRts plugins Group: Development/Libraries -Requires: kdemultimedia-arts = %{version}, noatun = %{version} +Requires: kdemultimedia-arts = %{version} +Requires: noatun = %{version} +%if ! %{build_mpeglib} +Obsoletes: kdemultimedia-libs +%endif %description devel Development files for aRts and noatun plugins. @@ -89,6 +128,9 @@ noatun plugins. Summary: A KDE media player Group: Applications/Multimedia Obsoletes: kdemultimedia +%if ! %{build_mpeglib} +Obsoletes: kdemultimedia-libs +%endif %description -n kaboodle A KDE media player. Kaboodle supports playback of Ogg, MP3 (including streaming @@ -98,6 +140,9 @@ MP3), MP2, WAV and MOD audio files as well as MPEG video files. Summary: A KDE media player Group: Applications/Multimedia Obsoletes: kdemultimedia +%if ! %{build_mpeglib} +Obsoletes: kdemultimedia-libs +%endif %description -n noatun A KDE media player. Noatun supports playback of Ogg, MP3 (including streaming @@ -107,6 +152,9 @@ MP3), MP2, WAV and MOD audio files as well as MPEG video files. Summary: KFile support for audio files Group: Applications/Multimedia Obsoletes: kdemultimedia +%if ! %{build_mpeglib} +Obsoletes: kdemultimedia-libs +%endif %description kfile Installing kdemultimedia-kfile allows all KFile aware applications (most KDE @@ -117,6 +165,9 @@ files. Summary: A MIDI player (using the soundcard's sequencer functionality) Group: Applications/Multimedia Obsoletes: kdemultimedia +%if ! %{build_mpeglib} +Obsoletes: kdemultimedia-libs +%endif %description -n kmid A MIDI player using the soundcard's sequencer functionality. kmid plays MIDI @@ -133,6 +184,9 @@ Summary: A MIDI player (converting to digital audio) Group: Applications/Multimedia Obsoletes: kdemultimedia Requires: timidity++ +%if ! %{build_mpeglib} +Obsoletes: kdemultimedia-libs +%endif %description -n kmidi A MIDI player. Kmidi works by converting MIDI files to digital audio and @@ -148,6 +202,9 @@ devices or your soundcard's builtin sequencer, try kmid instead. Summary: KDE sound mixer applet Group: Applications/Multimedia Obsoletes: kdemultimedia +%if ! %{build_mpeglib} +Obsoletes: kdemultimedia-libs +%endif %description -n kmix A sound mixer applet for KDE. kmix allows you to control the volumes of your @@ -156,7 +213,8 @@ sound card from a KDE panel applet. %package -n koncd Summary: Frontend for mastering and burning CDs Group: Applications/Archiving -Requires: cdrecord mkisofs +Requires: cdrecord +Requires: mkisofs %description -n koncd KOnCD is a graphical frontend for mastering and burning CD-ROMs. @@ -165,6 +223,9 @@ KOnCD is a graphical frontend for mastering and burning CD-ROMs. Summary: Audio-CD player for KDE Group: Applications/Multimedia Obsoletes: kdemultimedia +%if ! %{build_mpeglib} +Obsoletes: kdemultimedia-libs +%endif %description -n kscd KSCD is an Audio-CD player for KDE. @@ -188,15 +249,22 @@ Brahms is a MIDI sequencer and editor. %prep rm -rf $RPM_BUILD_ROOT -%if %{is_release} -%setup -q -n %{name}-%{version} +%if "%{isBuild}" == "%{build_release}" +%setup -q %else -%setup -q -n %{name} +%setup -q -n %{name}-%{version}-%{release_name} %endif + perl -pi -e "s,examples,,g" kmid/Make* + %patch1 -p1 -b .redhat %patch2 -p1 -b .glibc222 +%if %{buildbrahms} +%patch3 -p1 -b .config +%endif %patch4 -p1 +%patch5 -p1 -b .debug + perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in # koncd isn't perfect, but it works. Build it. @@ -206,14 +274,15 @@ rm -f koncd/configure.in.in rm -rf doc/aktion aktion # Workaround for legacy auto* tools +%if %{libtool} [ -x /usr/bin/autoconf-2.5? ] && ln -sf /usr/bin/autoconf-2.5? autoconf [ -x /usr/bin/autoheader-2.5? ] && ln -sf /usr/bin/autoheader-2.5? autoheader [ -x /usr/bin/aclocal-1.5 ] && ln -sf /usr/bin/aclocal-1.5 aclocal [ -x /usr/bin/automake-1.5 ] && ln -sf /usr/bin/automake-1.5 automake export PATH=`pwd`:$PATH -# End workaround +make -f admin/Makefile.common cvs +%endif -make -f Makefile.cvs find . -name "*.moc" -exec rm -rf {} \; %build @@ -221,32 +290,32 @@ export KDEDIR=%{prefix} unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH=%{prefix}/bin:$PATH export FLAGS="$RPM_OPT_FLAGS -DNDEBUG" - -CFLAGS="$FLAGS" CXXFLAGS="$FLAGS -fno-check-new" \ - ./configure --prefix=%{prefix} \ - --disable-motif \ - --with-motif-includes=none \ - --with-motif-libraries=none \ - --disable-debug \ - --without-debug \ - --without-alsa \ - --includedir=/usr/include/kde \ +export LANG=C + +CFLAGS="$FLAGS" CXXFLAGS="$FLAGS -fno-check-new -fno-use-cxa-atexit" \ +./configure --prefix=%{prefix} \ + --libdir=%{_libdir} \ + --disable-motif \ + --with-motif-includes=none \ + --with-motif-libraries=none \ + --disable-debug \ + --without-debug \ + --without-alsa \ + --includedir=/usr/include/kde \ %if %{final} - --enable-final \ + --enable-final \ %endif - --disable-xaw + --disable-xaw gcc -o gccver %{SOURCE900} if [ "0`./gccver`" -lt 3001 ]; then - find . -name Makefile |xargs perl -pi -e "s,^CXXLD\s*=.*,\$& -release gcc`./gccver -v`,g" + find . -name Makefile |xargs perl -pi -e "s,^CXXLD\s*=.*,\$& -release gcc`./gccver -v`,g" fi -# Disable parallel build as it's currently broken. -# make %{?_smp_mflags} -make -LANG=C make -C doc +make %{?_smp_mflags} +make -C doc -%if %buildbrahms +%if %{buildbrahms} # HACK: Build brahms after the rest was built... (the brahms build process requires # kdemultimedia devel headers)... # But it needs merged configure stuff... @@ -257,18 +326,17 @@ mv -f brahms/brahms.kdelnk brahms/brahms.desktop perl -pi -e "s,DQT_NO_ASCII_CAST,UQT_NO_ASCII_CAST,g" configure.in.in make -f Makefile.cvs CXXFLAGS="$FLAGS -fno-check-new" \ - ./configure --prefix=%{prefix} \ - --disable-motif \ - --with-motif-includes=none \ - --with-motif-libraries=none \ - --disable-debug \ - --without-debug \ - --without-alsa \ - --includedir=/usr/include/kde +./configure --prefix=%{prefix} \ + --libdir=%{_libdir} \ + --disable-motif \ + --with-motif-includes=none \ + --with-motif-libraries=none \ + --disable-debug \ + --without-debug \ + --without-alsa \ + --includedir=/usr/include/kde cd brahms -# Disable parallel build as it's currently broken. -# make %{?_smp_mflags} -make +make %{?_smp_mflags} %endif @@ -278,6 +346,7 @@ make install-strip DESTDIR=$RPM_BUILD_ROOT %else make install DESTDIR=$RPM_BUILD_ROOT %endif + make -C doc DESTDIR=$RPM_BUILD_ROOT install # KOnCD configuration... @@ -292,38 +361,34 @@ EOF # Set symlinks for files we renamed because of compiler ABI issues if [ "0`./gccver`" -lt 3001 ]; then - REL="gcc`./gccver -v`" - solink() { - sover=$1 - somajor=`echo $sover |sed -e "s,\..*,,"` - shift - for i in $@; do - if [ -e $RPM_BUILD_ROOT/%{_libdir}/lib${i}-${REL}.so ]; then - ln -s lib${i}-${REL}.so $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${sover} - ln -s lib${i}-${REL}.so $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${somajor} - elif [ -e $RPM_BUILD_ROOT%{_libdir}/lib${i}-${REL}.so.? ]; then - ln -s `basename $RPM_BUILD_ROOT%{_libdir}/lib${i}-${REL}.so.?` $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${sover} - ln -s `basename $RPM_BUILD_ROOT%{_libdir}/lib${i}-${REL}.so.?` $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${somajor} - fi - done - } - solink 0.0.0 arts_splay artsbuilder artsgui artsgui_idl artsgui_kde artsmidi artsmidi_idl artsmodules + REL="gcc`./gccver -v`" + solink() { + sover=$1 + somajor=`echo $sover |sed -e "s,\..*,,"` + shift + for i in $@; do + if [ -e $RPM_BUILD_ROOT/%{_libdir}/lib${i}-${REL}.so ]; then + ln -s lib${i}-${REL}.so $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${sover} + ln -s lib${i}-${REL}.so $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${somajor} + elif [ -e $RPM_BUILD_ROOT%{_libdir}/lib${i}-${REL}.so.? ]; then + ln -s `basename $RPM_BUILD_ROOT%{_libdir}/lib${i}-${REL}.so.?` $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${sover} + ln -s `basename $RPM_BUILD_ROOT%{_libdir}/lib${i}-${REL}.so.?` $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${somajor} + fi + done + } + solink 0.0.0 arts_splay artsbuilder artsgui artsgui_idl artsgui_kde artsmidi artsmidi_idl artsmodules fi %if %{strip_bin} for i in $RPM_BUILD_ROOT/%{prefix}/bin/*; do - strip -R .comment $i || : &>/dev/null + strip -R .comment $i || : &>/dev/null done %endif -# don't make these world-writeable -chmod go-w $RPM_BUILD_ROOT/%{_datadir}/apps/kscd/* -chmod go-w $RPM_BUILD_ROOT/%{_datadir}/apps/kscd/cddb/* - cd $RPM_BUILD_ROOT/%{_docdir}/HTML/en for i in *; do - rm -f $i/common - ln -sf ../common $i + rm -f $i/common + ln -sf ../common $i done %if %{desktop_file} @@ -393,18 +458,20 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_libdir}/mcop/Arts/* %{_libdir}/mcop/arts* +%if %{build_mpeglib} %{_libdir}/mcop/*PlayObject.mcopclass -# %{_libdir}/mcop/mpg123* -# %{_libdir}/libmpg* -#%{_libdir}/mcop/ogg* +%{_libdir}/mcop/mpg123* +%{_libdir}/libmpg* %{_libdir}/libarts_* +%endif +%{_libdir}/mcop/ogg* %{_libdir}/libartsbuilder* %{_libdir}/libartsgui* %{_libdir}/libartsmidi* %{_libdir}/libartsmodules* %{_libdir}/libaudiofile* %{_libdir}/mcop/audiofile* -#%{_libdir}/libogg* +%{_libdir}/libogg* %{_bindir}/arts* %{_bindir}/midisend %{_datadir}/apps/artsbuilder @@ -496,7 +563,7 @@ rm -rf $RPM_BUILD_ROOT %endif %{_bindir}/koncd %{_datadir}/config/koncdrc -# %doc %{_docdir}/HTML/en/koncd +#%doc %{_docdir}/HTML/en/koncd %files -n kscd %defattr(-,root,root) @@ -539,37 +606,54 @@ rm -rf $RPM_BUILD_ROOT %endif %doc %{_docdir}/HTML/en/noatun +%if %{build_mpeglib} %files libs %defattr(-,root,root) %{_libdir}/libmpeg* %{_libdir}/libyaf* %{_bindir}/yaf-* +%endif %files devel %defattr(-,root,root) %{_includedir}/kde/arts/* %{_includedir}/kde/noatun %{_includedir}/kde/*.h +%if %{build_mpeglib} %{_includedir}/kde/mpeglib %{_includedir}/mpeglib %{_includedir}/kde/mpeglib_artsplug +%endif %if %{buildbrahms} %files -n brahms %defattr(-,root,root) %{_datadir}/apps/brahms %{_datadir}/icons/*/*/*/brahms.png -#%if %{desktop_file} +%if "%{desktop_file}" == "1" %{_datadir}/applications/%{my_vendor}-brahms.desktop -#%else -#%{_datadir}/applnk/Multimedia/brahms.desktop -#%endif +%else +%{_datadir}/applnk/Multimedia/brahms.desktop +%endif %{_libdir}/*Brahms* %{_libdir}/mcop/*Brahms* %{_bindir}/brahms %endif %changelog +* Sun Dec 22 2002 Than Ngo 3.0.3-4.1 +- cleanup specfile + * Thu Aug 29 2002 Than Ngo than@redhat.com> 3.0.3-4 - fixed category issue diff --git a/sources b/sources index cbc469f..e6d7c60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10e34637313c4e481eb7a0726364fa6c kdemultimedia-3.0.3.tar.bz2 +076206997e1c203533f08eafe704e664 kdemultimedia-3.0.5a-patched.tar.bz2