From 6640fcaaaafa57972bec41dc00885f7b4ba4652c Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:52:18 +0000 Subject: auto-import kdemultimedia-3.0.2-4 from kdemultimedia-3.0.2-4.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 6a2a880..272fdd0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdemultimedia-3.0.0.tar.bz2 +kdemultimedia-3.0.2.tar.bz2 diff --git a/kdemultimedia.spec b/kdemultimedia.spec index 24afe5d..5f64385 100644 --- a/kdemultimedia.spec +++ b/kdemultimedia.spec @@ -1,25 +1,32 @@ +%define strip_bin 0 +%define final 0 +%define rpm_clean 1 +%define desktop_file 1 +%if %{desktop_file} +%define desktop_file_utils_version 0.2.93 +%endif +%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 3 +%define rel 4 %define buildbrahms 0 -Version: 3.0.0 - +Version: 3.0.2 Name: kdemultimedia Obsoletes: aktion Prefix: /usr %if %{is_release} %if "%{beta}" != "" -Release: 0.%{beta}.%{rel} +Release: 1.%{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} +Release: 1.cvs%{DATE}.%{rel} Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{DATE}.tar.bz2 %endif %if %buildbrahms @@ -31,12 +38,18 @@ 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 ExcludeArch: alpha Prereq: /sbin/ldconfig -BuildRequires: qt-devel zlib-devel XFree86-devel kdelibs-devel >= 3.0.0-10 kdebase-devel >= 3.0.0-10 libjpeg-devel gcc-c++ glibc-devel +BuildRequires: qt-devel zlib-devel XFree86-devel +BuildRequires: kdelibs-devel >= 3.0.0-10 kdebase-devel >= 3.0.0-10 +BuildRequires: libjpeg-devel gcc-c++ glibc-devel +%if %{desktop_file} +BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} +%endif Source900: gccver.c %description @@ -180,6 +193,7 @@ rm -rf $RPM_BUILD_ROOT perl -pi -e "s,examples,,g" kmid/Make* %patch1 -p1 -b .redhat %patch2 -p1 -b .glibc222 +%patch4 -p1 perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in # koncd isn't perfect, but it works. Build it. @@ -214,8 +228,11 @@ CFLAGS="$FLAGS" CXXFLAGS="$FLAGS -fno-check-new" \ --without-debug \ --without-alsa \ --includedir=/usr/include/kde \ +%if %{final} + --enable-final \ +%endif --disable-xaw -# Do this once it's fixed: --enable-final \ + 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" @@ -249,7 +266,11 @@ make %{?_smp_mflags} %install +%if %{strip_bin} +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... @@ -282,10 +303,11 @@ if [ "0`./gccver`" -lt 3001 ]; then 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 done +%endif # don't make these world-writeable chmod go-w $RPM_BUILD_ROOT/%{_datadir}/apps/kscd/* @@ -297,6 +319,45 @@ for i in *; do ln -sf ../common $i done +%if %{desktop_file} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +desktop-file-install --vendor %{my_vendor} \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "Application;AudioVideo;X-Red-Hat-Base" \ + --add-only-show-in KDE \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/kscd.desktop + +desktop-file-install --vendor %{my_vendor} \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "Application;AudioVideo;X-Red-Hat-Extra" \ + --add-only-show-in KDE \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/artsbuilder.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/artscontrol.desktop + +desktop-file-install --vendor %{my_vendor} \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "Application;AudioVideo;X-Red-Hat-Extra" \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/kmid.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/kmidi.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/koncd.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/timidity.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/kaboodle.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/noatun.desktop + +desktop-file-install --vendor %{my_vendor} \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "Application;AudioVideo;X-Red-Hat-Base" \ + --add-only-show-in KDE \ + --copy-generic-name-to-name \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/kmix.desktop + +desktop-file-install --vendor %{my_vendor} \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "X-KDE-Sound" \ + --add-only-show-in KDE \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/Sound/kmixcfg.desktop +%endif + %post arts -p /sbin/ldconfig %postun arts -p /sbin/ldconfig @@ -313,7 +374,9 @@ done %postun -n kmid -p /sbin/ldconfig %clean -# rm -rf $RPM_BUILD_ROOT +%if %{rpm_clean} +rm -rf $RPM_BUILD_ROOT +%endif %files arts %defattr(-,root,root) @@ -323,7 +386,11 @@ done # %{_libdir}/mcop/mpg123* # %{_libdir}/libmpg* #%{_libdir}/mcop/ogg* -%{_libdir}/libarts* +%{_libdir}/libarts_* +%{_libdir}/libartsbuilder* +%{_libdir}/libartsgui* +%{_libdir}/libartsmidi* +%{_libdir}/libartsmodules* %{_libdir}/libaudiofile* %{_libdir}/mcop/audiofile* #%{_libdir}/libogg* @@ -333,7 +400,11 @@ done %{_datadir}/apps/artsbuilder %{_datadir}/apps/artscontrol %{_datadir}/icons/*/*/*/arts* +%if %{desktop_file} +%{_datadir}/applications/%{my_vendor}-arts* +%else %{_datadir}/applnk/Multimedia/arts* +%endif %{_datadir}/mimelnk/*/x-arts* %doc %{_docdir}/HTML/en/artsbuilder @@ -341,7 +412,11 @@ done %defattr(-,root,root) %{_datadir}/icons/*/*/*/kaboodle.png %{_datadir}/apps/kaboodle -%{_datadir}/applnk/Multimedia/kaboodle.desktop +%if %{desktop_file} +%{_datadir}/applications/%{my_vendor}-kaboodle.desktop +%else +{_datadir}/applnk/Multimedia/kaboodle.desktop +%endif %{_datadir}/services/kaboodle_component.desktop %{_libdir}/libkaboodlepart* %{_libdir}/kaboodle*.* @@ -356,7 +431,11 @@ done %defattr(-,root,root) %{_datadir}/apps/kmid %{_datadir}/icons/*/*/*/kmid.png +%if %{desktop_file} +%{_datadir}/applications/%{my_vendor}-kmid.desktop +%else %{_datadir}/applnk/Multimedia/kmid.desktop +%endif %{_datadir}/mimelnk/audio/x-karaoke.desktop %{_datadir}/servicetypes/audiomidi.desktop %{_libdir}/libkmidpart* @@ -366,8 +445,13 @@ done %files -n kmidi %defattr(-,root,root) %{_datadir}/apps/kmidi +%if %{desktop_file} +%{_datadir}/applications/%{my_vendor}-kmidi.desktop +%{_datadir}/applications/%{my_vendor}-timidity.desktop +%else %{_datadir}/applnk/Multimedia/kmidi.desktop %{_datadir}/applnk/Multimedia/timidity.desktop +%endif %{_datadir}/icons/*/*/*/kmidi.png %{_bindir}/kmidi %{_bindir}/sf2cfg @@ -378,8 +462,13 @@ done %{_libdir}/kde3/kcm_kmix* %{_libdir}/kmix* %{_libdir}/kde3/*kmix* +%if %{desktop_file} +%{_datadir}/applications/%{my_vendor}-kmix.desktop +%{_datadir}/applications/%{my_vendor}-kmixcfg.desktop +%else %{_datadir}/applnk/Multimedia/kmix.desktop %{_datadir}/applnk/Settings/Sound/kmixcfg.desktop +%endif %{_datadir}/icons/*/*/*/kmix.png %{_datadir}/apps/kmix %{_datadir}/apps/kicker/applets/kmixapplet.desktop @@ -391,7 +480,11 @@ done %defattr(-,root,root) %{_datadir}/icons/*/*/*/koncd.png %{_datadir}/apps/koncd +%if %{desktop_file} +%{_datadir}/applications/%{my_vendor}-koncd.desktop +%else %{_datadir}/applnk/Multimedia/koncd.desktop +%endif %{_bindir}/koncd %{_datadir}/config/koncdrc # %doc %{_docdir}/HTML/en/koncd @@ -403,7 +496,11 @@ done %{_bindir}/kscd %{_bindir}/workman2cddb.pl %{_datadir}/icons/*/*/*/kscd.png +%if %{desktop_file} +%{_datadir}/applications/%{my_vendor}-kscd.desktop +%else %{_datadir}/applnk/Multimedia/kscd.desktop +%endif %{_datadir}/mimelnk/text/xmcd.desktop %doc %{_docdir}/HTML/en/kscd @@ -426,7 +523,11 @@ done %{_libdir}/kde3/noatun* %{_libdir}/libwinskinvis*.* %{_bindir}/noatun* +%if %{desktop_file} +%{_datadir}/applications/%{my_vendor}-noatun.desktop +%else %{_datadir}/applnk/Multimedia/noatun.desktop +%endif %doc %{_docdir}/HTML/en/noatun %files libs @@ -444,18 +545,44 @@ done %{_includedir}/mpeglib %{_includedir}/kde/mpeglib_artsplug -%if %buildbrahms +%if %{buildbrahms} %files -n brahms %defattr(-,root,root) %{_datadir}/apps/brahms %{_datadir}/icons/*/*/*/brahms.png -%{_datadir}/applnk/Multimedia/brahms.desktop +#%if %{desktop_file} +%{_datadir}/applications/%{my_vendor}-brahms.desktop +#%else +#%{_datadir}/applnk/Multimedia/brahms.desktop +#%endif %{_libdir}/*Brahms* %{_libdir}/mcop/*Brahms* %{_bindir}/brahms %endif %changelog +* Thu Aug 8 2002 Than Ngo 3.0.2-4 +- desktop file issues + +* Mon Jul 22 2002 Tim Powers 3.0.2-3 +- rebuild using gcc-3.2-0.1 + +* Sat Jul 20 2002 Than Ngo 3.0.2-2 +- fix desktop files issue + +* Wed Jul 10 2002 Than Ngo 3.0.2-1 +- 3.0.2 +- use desktop-file-install + +* Thu Jun 06 2002 Than Ngo 3.0.1-3 +- rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri May 10 2002 Bernhard Rosenkraenzer 3.0.1-1 +- 3.0.1 + * Wed Apr 17 2002 Bernhard Rosenkraenzer 3.0.0-3 - Make sure we link to the just built libraries instead of libs in the build environment from older releases diff --git a/sources b/sources index f0e00b5..1a119b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -693eb1215b76c12b4cf416072dba4210 kdemultimedia-3.0.0.tar.bz2 +b794f63425e5584a4de1a0f7e07d9ff7 kdemultimedia-3.0.2.tar.bz2