rpms/kdemultimedia/devel kdemultimedia.spec,1.81,1.82
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed May 16 13:27:11 UTC 2007
- Previous message (by thread): rpms/windowlab/EL-5 windowlab.spec,1.1,1.2
- Next message (by thread): rpms/moin/devel .cvsignore, 1.9, 1.10 moin.spec, 1.15, 1.16 sources, 1.9, 1.10 00821_SECURITY_FIX_use_ACL_in_include_directive.patch, 1.1, NONE 00825_SECURITY-fix_MonthCalendar_respect_ACLs.patch, 1.1, NONE 00829_SECURITY_FIX_XSS_in_AttachFile_do_parameter.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4760
Modified Files:
kdemultimedia.spec
Log Message:
* Wed May 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-7
- -extras scriptlets
Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- kdemultimedia.spec 10 May 2007 03:08:01 -0000 1.81
+++ kdemultimedia.spec 16 May 2007 13:26:37 -0000 1.82
@@ -1,4 +1,10 @@
+## FIXME/TODO:
+# * make kdemultimedia-3.5.6-patched tarball (with script/instructions)
+# * kdemultimedia-arts/arts-extras subpkg, http://bugzilla.redhat.com/191097
+# * split free/nonfree codecs from *.mcopclass files, in particular:
+# akodePlayObject.mcopclass, xine*.mcopclass (yuck)
+
%define debug 0
%define final 0
%define make_cvs 1
@@ -12,16 +18,16 @@
%define _with_taglib --with-taglib
%define _with_xine --with-xine
-Name: kdemultimedia
+Name: kdemultimedia
Summary: Multimedia applications for the K Desktop Environment (KDE)
-Epoch: 6
+Epoch: 6
Version: 3.5.6
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPL
-Group: Applications/Multimedia
-Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-patched.tar.bz2
+Group: Applications/Multimedia
+Url: http://www.kde.org
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-patched.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch2: kdemultimedia-3.5.6-config.patch
@@ -33,21 +39,17 @@
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
Requires: kdebase >= 6:%{version}
BuildRequires: zlib-devel
-BuildRequires: kdebase-devel
+BuildRequires: kdebase-devel >= 6:%{version}
BuildRequires: libvorbis-devel
BuildRequires: audiofile-devel
-BuildRequires: glib2-devel
BuildRequires: desktop-file-utils
BuildRequires: libtheora-devel
BuildRequires: flac-devel
-BuildRequires: alsa-lib-devel >= 1.0.2
-BuildRequires: cdparanoia
-BuildRequires: cdparanoia-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gstreamer-devel
%if %{make_cvs}
BuildRequires: automake libtool
@@ -105,9 +107,15 @@
make -f admin/Makefile.common cvs
%endif
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
+# just to be paranoid -- Rex
+DO_NOT_COMPILE=""
+export DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"
+export DO_NOT_COMPILE="$DO_NOT_COMPILE mpg123_artsplugin"
+
%configure \
--enable-new-ldflags \
--disable-dependency-tracking \
@@ -139,13 +147,17 @@
make %{?_smp_mflags}
make %{?_smp_mflags} -C kaudiocreator
+
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
make -C kaudiocreator DESTDIR=%{buildroot} install
-# only show in KDE
+## Remove/uninstall (conflicting) bits we don't want
+rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
+
+# only show in KDE, really? -- Rex (FIXME)
for f in %{buildroot}%{appdir}/*.desktop ; do
if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
echo "OnlyShowIn=KDE;" >> $f
@@ -186,6 +198,7 @@
done
done
+
%post
/sbin/ldconfig
for f in crystalsvg hicolor locolor ; do
@@ -202,9 +215,25 @@
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+%post extras
+for f in crystalsvg hicolor ; do
+ touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+ gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun extras
+for f in crystalsvg hicolor ; do
+ touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+ gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+
%clean
rm -rf %{buildroot}
+
%files extras
%defattr(-,root,root,-)
@@ -299,7 +328,9 @@
%{_datadir}/autostart/*
%{_datadir}/config.kcfg/*
%{_datadir}/desktop-directories/*
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
%{_datadir}/mimelnk/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
@@ -314,9 +345,13 @@
%exclude %{_libdir}/liboggarts.so
%exclude %{_libdir}/libwinskinvis.so
+
%changelog
+* Wed May 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-7
+- -extras scriptlets
+
* Wed May 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-6
-- extras=1
+- extras=1 (BR: akode-devel libsamplerate-devel taglib-devel xine-lib-devel)
* Wed Apr 18 2007 Than Ngo <than at redhat.com> - 6:3.5.6-4.fc7
- kaboodle, noatun, juk Split into an extra package
- Previous message (by thread): rpms/windowlab/EL-5 windowlab.spec,1.1,1.2
- Next message (by thread): rpms/moin/devel .cvsignore, 1.9, 1.10 moin.spec, 1.15, 1.16 sources, 1.9, 1.10 00821_SECURITY_FIX_use_ACL_in_include_directive.patch, 1.1, NONE 00825_SECURITY-fix_MonthCalendar_respect_ACLs.patch, 1.1, NONE 00829_SECURITY_FIX_XSS_in_AttachFile_do_parameter.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list