rpms/kdemultimedia-extras/FC-5 kdemultimedia-3.5.2-omit_kfile_mpeg.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kdemultimedia-extras.spec, 1.2, 1.3 sources, 1.2, 1.3
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri May 5 12:29:24 UTC 2006
- Previous message: rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec,1.5,1.6
- Next message: rpms/kdemultimedia-extras/FC-4 kdemultimedia-3.5.2-omit_kfile_mpeg.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kdemultimedia-extras.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/extras/rpms/kdemultimedia-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10860
Modified Files:
.cvsignore kdemultimedia-extras.spec sources
Added Files:
kdemultimedia-3.5.2-omit_kfile_mpeg.patch
Log Message:
* Fri May 05 2006 Rex Dieter 6:3.5.2-4
- respin 3.5.2 for Extras
kdemultimedia-3.5.2-omit_kfile_mpeg.patch:
--- NEW FILE kdemultimedia-3.5.2-omit_kfile_mpeg.patch ---
--- kdemultimedia-3.5.2/kfile-plugins/Makefile.am.omit_kfile_mpeg_plugin 2005-09-10 03:20:08.000000000 -0500
+++ kdemultimedia-3.5.2/kfile-plugins/Makefile.am 2006-04-02 22:01:51.000000000 -0500
@@ -18,5 +18,5 @@
KFILE_THEORA_SUBDIR=theora
endif
-SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi mpeg wav sid $(KFILE_OGG_SUBDIR) \
+SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi wav sid $(KFILE_OGG_SUBDIR) \
$(KFILE_FLAC_SUBDIR) $(KFILE_THEORA_SUBDIR)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 31 Mar 2006 12:39:58 -0000 1.2
+++ .cvsignore 5 May 2006 12:29:24 -0000 1.3
@@ -1 +1 @@
-kdemultimedia-3.5.1-patched.tar.bz2
+kdemultimedia-3.5.2-patched.tar.bz2
Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdemultimedia-extras.spec 13 Apr 2006 18:43:13 -0000 1.2
+++ kdemultimedia-extras.spec 5 May 2006 12:29:24 -0000 1.3
@@ -18,8 +18,6 @@
%if "%{?extras}" == "1"
%define patched -patched
%define _with_akode --with-akode
-#define to include/build juk, undef not
-%define juk juk
# to make sure no nonfree bits get included
BuildConflicts: akode-extras
# debugging: to make sure no extras bits (accidentally) get excluded
@@ -33,6 +31,7 @@
%define _with_akode --with-akode
BuildRequires: akode-extras
%define _with_lame --with-lame --disable-lametest
+%define _with_taglib --with-taglib
%define _with_xine --with-xine
%endif
@@ -42,6 +41,9 @@
%endif
%if "%{?fedora}" > "4"
%define gst gstreamer08
+BuildRequires: libXxf86vm-devel
+# likely only required for nonfree -- Rex
+BuildRequires: libXxf86dga-devel
%endif
%if "%{?rhel}" > "3"
%define _with_gstreamer --with-gstreamer
@@ -58,28 +60,27 @@
Summary: Extras for KDE multimedia applications
%endif
%if "%{?nonfree}" == "1"
-Name: kdemultimedia-nonfree
+Name: kdemultimedia-extras-nonfree
Summary: Nonfree Extras for KDE multimedia applications
%endif
Group: Applications/Multimedia
Epoch: 6
-Version: 3.5.1
-Release: 8%{?dist}%{?kde}
+Version: 3.5.2
+Release: 5%{?dist}%{?kde}
License: GPL
-%if "%{?nonfree}" == "1"
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
-%else
+%if "%{?patched:1}" == "1"
# From Core's kdemultimedia pkg
-Source0: kdemultimedia-3.5.1-patched.tar.bz2
+Source0: kdemultimedia-%{version}-patched.tar.bz2
+%else
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
%endif
Url: http://multimedia.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdelibs-devel >= 6:%{version}
Requires: kdelibs >= 6:%{version}
-BuildRequires: libtool
%if "%{is_release}" != "1"
BuildRequires: automake
%endif
@@ -113,6 +114,8 @@
## kde-redhat patches
# unconditinally include oggvorbis_artsplugin
Patch1000: kdemultimedia-3.5.0-oggvorbis_artsplugin.patch
+# exclude kfile_mpeg
+Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch
# increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744
Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch
# akode: http://bugs.kde.org/116958
@@ -151,26 +154,27 @@
%if "%{?extras}" == "1"
# debugging
%{?debug:BuildConflicts: kdemultimedia-extras }
-Requires: kdemultimedia >= %{epoch}:%{version}
+Requires: kdemultimedia >= %{epoch}:%{version}
%description
%{summary}, including:
* akode_artsplugin (akode)
-%{?juk:* juk (libtunepimp)}
+* juk (libtunepimp)
* kfile-plugins: flac, mpc (taglib)
%endif
%if "%{?nonfree}" == "1"
+Obsoletes: kdemultimedia-nonfree < %{epoch}:%{version}-%{release}
# debugging
%{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}}
-%{?debug:BuildConflicts: kdemultimedia-nonfree}
-Requires: kdemultimedia = %{epoch}:%{version}
+%{?debug:BuildConflicts: kdemultimedia-extras-nonfree}
+Requires: kdemultimedia >= %{epoch}:%{version}
# for main akode_artsplugins bits
Requires: kdemultimedia-extras >= %{epoch}:%{version}
Requires: akode-extras
%description
%{summary}, including:
* akode_artsplugin (akode-extras),
-* kfile-plugins: mp3 (taglib),
+* kfile-plugins: mp3 (taglib), mpeg
* krec mp3 export (lame),
* mpeglib_artsplugin,
* xine_artsplugin (xine-lib)
@@ -204,7 +208,6 @@
DO_NOT_COMPILE=""
-%{!?juk:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"}
#{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"}
#{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"}
#{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"}
@@ -241,14 +244,14 @@
%endif
%if "%{?extras}" == "1"
-for module in arts akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do
-make -C $module %{?_smp_mflags}
+for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do
+make %{?_smp_mflags} -C $module
done
%endif
%if "%{?nonfree}" == "1"
-for module in arts akode_artsplugin kfile-plugins/mp3 krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do
-make -C $module %{?_smp_mflags}
+for module in arts akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do
+make %{?_smp_mflags} -C $module
done
%endif
@@ -261,17 +264,17 @@
%endif
%if "%{?extras}" == "1"
-for module in akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do
-make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do
+make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module
done
-%if "%{?juk:1}" == "1"
+#if "%{?juk:1}" == "1"
desktop-file-install --vendor="fedora" \
--delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
--add-category="X-Fedora" \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop
-%endif
+#endif
%if "%{?debug}" == "1"
# Conflicts check (debuging only)
@@ -287,8 +290,8 @@
%endif
%if "%{?nonfree}" == "1"
-for module in akode_artsplugin kfile-plugins/mp3 krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do
-make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+for module in akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do
+make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module
done
## Remove/unstinstall (conflicting) bits we don't want
# -extras bits
@@ -359,8 +362,7 @@
%endif
%if "%{?extras}" == "1"
-# Since the icons come from juk
-%if "%{?juk:1}" == "1"
+#if "%{?juk:1}" == "1"
%post
for icon_theme in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
@@ -372,7 +374,7 @@
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
-%endif
+#endif
%endif
%if "%{?nonfree}" == "1"
@@ -413,7 +415,7 @@
%files -f extras.list
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
-%{?juk:%dir %{_datadir}/apps/juk/}
+%dir %{_datadir}/apps/juk/
%endif
%if "%{?nonfree}" == "1"
@@ -433,8 +435,30 @@
%changelog
-* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.1-8
-- -extras: Requires: kdemultimedia >= 6:3.5.1
+* Fri May 05 2006 Rex Dieter 6:3.5.2-5
+- relax Requires: kdemultimedia
+
+* Fri May 05 2006 Rex Dieter 6:3.5.2-4
+- respin 3.5.2 for Extras
+
+* Sun Apr 02 2006 Rex Dieter 6:3.5.2-3
+- omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree)
+
+* Tue Mar 28 2006 Rex Dieter 6:3.5.2-2
+- -extras-nonfree: (fix) Obsoletes: kdemultimedia-nonfree
+
+* Mon Mar 20 2006 Rex Dieter 6:3.5.2-1
+- 3.5.2
+
+* Fri Mar 17 2006 Rex Dieter 6:3.5.1-10
+- fc5: BR: libXxf86vm-devel
+
+* Fri Mar 17 2006 Rex Dieter 6:3.5.1-9
+- fc5: BR: libXxf86dga-devel
+
+* Fri Mar 17 2006 Rex Dieter 6:3.5.1-8
+- -extras-nonfree: rename -nonfree -> -extras-nonfree
+- -extras-nonfree: drop 0.lvn from Release
* Thu Mar 16 2006 Rex Dieter 6:3.5.1-7
- kfile-plugins/mp3: -extras -> -nonfree
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 31 Mar 2006 12:39:58 -0000 1.2
+++ sources 5 May 2006 12:29:24 -0000 1.3
@@ -1 +1 @@
-31630864143d052b8f4342da0fa098fd kdemultimedia-3.5.1-patched.tar.bz2
+54f9947051ee5cf50c81a5ea382943f1 kdemultimedia-3.5.2-patched.tar.bz2
- Previous message: rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec,1.5,1.6
- Next message: rpms/kdemultimedia-extras/FC-4 kdemultimedia-3.5.2-omit_kfile_mpeg.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kdemultimedia-extras.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list