rpms/kdebase-runtime/F-7 kdebase-runtime-4.0.3-deinterlace-crash.patch, NONE, 1.1 kdebase-runtime-4.0.3-khelpcenter.patch, NONE, 1.1 kdebase-runtime-4.0.3-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kdebase-runtime.spec, 1.5, 1.6 sources, 1.6, 1.7
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Apr 22 18:37:18 UTC 2008
- Previous message (by thread): rpms/libwiimote/F-9 libwiimote-0.4-libs.patch, NONE, 1.1 libwiimote.spec, 1.4, 1.5
- Next message (by thread): rpms/kdebase-runtime/F-8 kdebase-runtime-4.0.3-deinterlace-crash.patch, NONE, 1.1 kdebase-runtime-4.0.3-khelpcenter.patch, NONE, 1.1 kdebase-runtime-4.0.3-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kdebase-runtime.spec, 1.5, 1.6 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdebase-runtime/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10225/F-7
Modified Files:
.cvsignore kdebase-runtime.spec sources
Added Files:
kdebase-runtime-4.0.3-deinterlace-crash.patch
kdebase-runtime-4.0.3-khelpcenter.patch
kdebase-runtime-4.0.3-pulseaudio.patch
Log Message:
sync w/devel branch (kde-4.0.3)
kdebase-runtime-4.0.3-deinterlace-crash.patch:
--- NEW FILE kdebase-runtime-4.0.3-deinterlace-crash.patch ---
diff -ur kdebase-runtime-4.0.3/phonon/xine/kcm/xineoptions.cpp kdebase-runtime-4.0.3-deinterlace-crash/phonon/xine/kcm/xineoptions.cpp
--- kdebase-runtime-4.0.3/phonon/xine/kcm/xineoptions.cpp 2008-01-05 00:54:43.000000000 +0100
+++ kdebase-runtime-4.0.3-deinterlace-crash/phonon/xine/kcm/xineoptions.cpp 2008-04-05 17:07:45.000000000 +0200
@@ -30,7 +30,7 @@
K_EXPORT_PLUGIN(XineOptionsFactory("kcm_phononxine"))
XineOptions::XineOptions(QWidget *parent, const QVariantList &args)
- : KCModule(XineOptionsFactory::componentData(), parent, args)
+ : KCModule(XineOptionsFactory::componentData(), parent, args), m_noDeinterlace(false)
{
setupUi(this);
@@ -60,35 +60,39 @@
xine_init(xine);
xine_video_port_t *nullVideoPort = xine_open_video_driver(xine, "auto", XINE_VISUAL_TYPE_NONE, 0);
xine_post_t *deinterlacer = xine_post_init(xine, "tvtime", 1, 0, &nullVideoPort);
- Q_ASSERT(deinterlacer);
- xine_post_in_t *paraInput = xine_post_input(deinterlacer, "parameters");
- Q_ASSERT(paraInput);
- Q_ASSERT(paraInput->data);
- xine_post_api_t *api = reinterpret_cast<xine_post_api_t *>(paraInput->data);
- xine_post_api_descr_t *desc = api->get_param_descr();
- for (int i = 0; desc->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
- xine_post_api_parameter_t &p = desc->parameter[i];
- switch (p.type) {
- case POST_PARAM_TYPE_INT: /* integer (or vector of integers) */
- if (0 == strcmp(p.name, "method") && p.enum_values) {
- for (int j = 0; p.enum_values[j]; ++j) {
- deinterlaceMethodBox->addItem(p.enum_values[j]);
+ if (deinterlacer) {
+ xine_post_in_t *paraInput = xine_post_input(deinterlacer, "parameters");
+ Q_ASSERT(paraInput);
+ Q_ASSERT(paraInput->data);
+ xine_post_api_t *api = reinterpret_cast<xine_post_api_t *>(paraInput->data);
+ xine_post_api_descr_t *desc = api->get_param_descr();
+ for (int i = 0; desc->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
+ xine_post_api_parameter_t &p = desc->parameter[i];
+ switch (p.type) {
+ case POST_PARAM_TYPE_INT: /* integer (or vector of integers) */
+ if (0 == strcmp(p.name, "method") && p.enum_values) {
+ for (int j = 0; p.enum_values[j]; ++j) {
+ deinterlaceMethodBox->addItem(p.enum_values[j]);
+ }
}
+ break;
+ case POST_PARAM_TYPE_DOUBLE: /* double (or vector of doubles) */
+ case POST_PARAM_TYPE_CHAR: /* char (or vector of chars = string) */
+ case POST_PARAM_TYPE_STRING: /* (char *), ASCIIZ */
+ case POST_PARAM_TYPE_STRINGLIST: /* (char **) list, NULL terminated */
+ case POST_PARAM_TYPE_BOOL: /* integer (0 or 1) */
+ break;
+ case POST_PARAM_TYPE_LAST: /* terminator of parameter list */
+ default:
+ kFatal() << "invalid type";
}
- break;
- case POST_PARAM_TYPE_DOUBLE: /* double (or vector of doubles) */
- case POST_PARAM_TYPE_CHAR: /* char (or vector of chars = string) */
- case POST_PARAM_TYPE_STRING: /* (char *), ASCIIZ */
- case POST_PARAM_TYPE_STRINGLIST: /* (char **) list, NULL terminated */
- case POST_PARAM_TYPE_BOOL: /* integer (0 or 1) */
- break;
- case POST_PARAM_TYPE_LAST: /* terminator of parameter list */
- default:
- kFatal() << "invalid type";
}
- }
- xine_post_dispose(xine, deinterlacer);
+ xine_post_dispose(xine, deinterlacer);
+ } else {
+ m_noDeinterlace = true;
+ deinterlaceGroupBox->setEnabled(false);
+ }
xine_close_video_driver(xine, nullVideoPort);
xine_exit(xine);
}
@@ -108,29 +112,35 @@
{
KConfigGroup cg(m_config, "Settings");
m_ossCheckbox->setChecked(cg.readEntry("showOssDevices", false));
- deinterlaceMediaList->item(0)->setCheckState(cg.readEntry("deinterlaceDVD", true) ? Qt::Checked : Qt::Unchecked);
- deinterlaceMediaList->item(1)->setCheckState(cg.readEntry("deinterlaceVCD", false) ? Qt::Checked : Qt::Unchecked);
- deinterlaceMediaList->item(2)->setCheckState(cg.readEntry("deinterlaceFile", false) ? Qt::Checked : Qt::Unchecked);
- deinterlaceMethodBox->setCurrentIndex(cg.readEntry("deinterlaceMethod", 0));
+ if (!m_noDeinterlace) {
+ deinterlaceMediaList->item(0)->setCheckState(cg.readEntry("deinterlaceDVD", true) ? Qt::Checked : Qt::Unchecked);
+ deinterlaceMediaList->item(1)->setCheckState(cg.readEntry("deinterlaceVCD", false) ? Qt::Checked : Qt::Unchecked);
+ deinterlaceMediaList->item(2)->setCheckState(cg.readEntry("deinterlaceFile", false) ? Qt::Checked : Qt::Unchecked);
+ deinterlaceMethodBox->setCurrentIndex(cg.readEntry("deinterlaceMethod", 0));
+ }
}
void XineOptions::save()
{
KConfigGroup cg(m_config, "Settings");
cg.writeEntry("showOssDevices", m_ossCheckbox->isChecked());
- cg.writeEntry("deinterlaceDVD", deinterlaceMediaList->item(0)->checkState() == Qt::Checked);
- cg.writeEntry("deinterlaceVCD", deinterlaceMediaList->item(1)->checkState() == Qt::Checked);
- cg.writeEntry("deinterlaceFile", deinterlaceMediaList->item(2)->checkState() == Qt::Checked);
- cg.writeEntry("deinterlaceMethod", deinterlaceMethodBox->currentIndex());
+ if (!m_noDeinterlace) {
+ cg.writeEntry("deinterlaceDVD", deinterlaceMediaList->item(0)->checkState() == Qt::Checked);
+ cg.writeEntry("deinterlaceVCD", deinterlaceMediaList->item(1)->checkState() == Qt::Checked);
+ cg.writeEntry("deinterlaceFile", deinterlaceMediaList->item(2)->checkState() == Qt::Checked);
+ cg.writeEntry("deinterlaceMethod", deinterlaceMethodBox->currentIndex());
+ }
}
void XineOptions::defaults()
{
m_ossCheckbox->setChecked(false);
- deinterlaceMediaList->item(0)->setCheckState(Qt::Checked);
- deinterlaceMediaList->item(1)->setCheckState(Qt::Unchecked);
- deinterlaceMediaList->item(2)->setCheckState(Qt::Unchecked);
- deinterlaceMethodBox->setCurrentIndex(0);
+ if (!m_noDeinterlace) {
+ deinterlaceMediaList->item(0)->setCheckState(Qt::Checked);
+ deinterlaceMediaList->item(1)->setCheckState(Qt::Unchecked);
+ deinterlaceMediaList->item(2)->setCheckState(Qt::Unchecked);
+ deinterlaceMethodBox->setCurrentIndex(0);
+ }
}
#include "xineoptions.moc"
diff -ur kdebase-runtime-4.0.3/phonon/xine/kcm/xineoptions.h kdebase-runtime-4.0.3-deinterlace-crash/phonon/xine/kcm/xineoptions.h
--- kdebase-runtime-4.0.3/phonon/xine/kcm/xineoptions.h 2008-01-05 00:54:43.000000000 +0100
+++ kdebase-runtime-4.0.3-deinterlace-crash/phonon/xine/kcm/xineoptions.h 2008-04-05 17:04:20.000000000 +0200
@@ -42,6 +42,7 @@
private:
KSharedConfigPtr m_config;
+ bool m_noDeinterlace;
};
#endif // PHONON_XINEOPTIONS_H
diff -ur kdebase-runtime-4.0.3/phonon/xine/kcm/xineoptions.ui kdebase-runtime-4.0.3-deinterlace-crash/phonon/xine/kcm/xineoptions.ui
--- kdebase-runtime-4.0.3/phonon/xine/kcm/xineoptions.ui 2008-03-27 21:34:21.000000000 +0100
+++ kdebase-runtime-4.0.3-deinterlace-crash/phonon/xine/kcm/xineoptions.ui 2008-04-05 17:07:25.000000000 +0200
@@ -85,7 +85,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox" >
+ <widget class="QGroupBox" name="deinterlaceGroupBox" >
<property name="title" >
<string>Deinterlacing</string>
</property>
diff -ur kdebase-runtime-4.0.3/phonon/xine/xinestream.cpp kdebase-runtime-4.0.3-deinterlace-crash/phonon/xine/xinestream.cpp
--- kdebase-runtime-4.0.3/phonon/xine/xinestream.cpp 2008-03-27 21:34:21.000000000 +0100
+++ kdebase-runtime-4.0.3-deinterlace-crash/phonon/xine/xinestream.cpp 2008-04-05 17:10:33.000000000 +0200
@@ -171,33 +171,33 @@
videoPort = XineEngine::nullVideoPort();
}
m_deinterlacer = xine_post_init(XineEngine::xine(), "tvtime", 1, 0, &videoPort);
- Q_ASSERT(m_deinterlacer);
-
- // set method
- xine_post_in_t *paraInput = xine_post_input(m_deinterlacer, "parameters");
- Q_ASSERT(paraInput);
- Q_ASSERT(paraInput->data);
- xine_post_api_t *api = reinterpret_cast<xine_post_api_t *>(paraInput->data);
- xine_post_api_descr_t *desc = api->get_param_descr();
- char *pluginParams = static_cast<char *>(malloc(desc->struct_size));
- api->get_parameters(m_deinterlacer, pluginParams);
- for (int i = 0; desc->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
- xine_post_api_parameter_t &p = desc->parameter[i];
- if (p.type == POST_PARAM_TYPE_INT && 0 == strcmp(p.name, "method")) {
- int *value = reinterpret_cast<int *>(pluginParams + p.offset);
- *value = XineEngine::deinterlaceMethod();
- break;
+ if (m_deinterlacer) {
+ // set method
+ xine_post_in_t *paraInput = xine_post_input(m_deinterlacer, "parameters");
+ Q_ASSERT(paraInput);
+ Q_ASSERT(paraInput->data);
+ xine_post_api_t *api = reinterpret_cast<xine_post_api_t *>(paraInput->data);
+ xine_post_api_descr_t *desc = api->get_param_descr();
+ char *pluginParams = static_cast<char *>(malloc(desc->struct_size));
+ api->get_parameters(m_deinterlacer, pluginParams);
+ for (int i = 0; desc->parameter[i].type != POST_PARAM_TYPE_LAST; ++i) {
+ xine_post_api_parameter_t &p = desc->parameter[i];
+ if (p.type == POST_PARAM_TYPE_INT && 0 == strcmp(p.name, "method")) {
+ int *value = reinterpret_cast<int *>(pluginParams + p.offset);
+ *value = XineEngine::deinterlaceMethod();
+ break;
+ }
}
- }
- api->set_parameters(m_deinterlacer, pluginParams);
- free(pluginParams);
+ api->set_parameters(m_deinterlacer, pluginParams);
+ free(pluginParams);
- // connect to xine_stream_t
- xine_post_in_t *x = xine_post_input(m_deinterlacer, "video");
- Q_ASSERT(x);
- xine_post_out_t *videoOutputPort = xine_get_video_source(m_stream);
- Q_ASSERT(videoOutputPort);
- xine_post_wire(videoOutputPort, x);
+ // connect to xine_stream_t
+ xine_post_in_t *x = xine_post_input(m_deinterlacer, "video");
+ Q_ASSERT(x);
+ xine_post_out_t *videoOutputPort = xine_get_video_source(m_stream);
+ Q_ASSERT(videoOutputPort);
+ xine_post_wire(videoOutputPort, x);
+ }
} else if (m_deinterlacer) {
xine_post_dispose(XineEngine::xine(), m_deinterlacer);
m_deinterlacer = 0;
kdebase-runtime-4.0.3-khelpcenter.patch:
--- NEW FILE kdebase-runtime-4.0.3-khelpcenter.patch ---
diff -up kdebase-runtime-4.0.3/khelpcenter/docmetainfo.cpp.orig kdebase-runtime-4.0.3/khelpcenter/docmetainfo.cpp
--- kdebase-runtime-4.0.3/khelpcenter/docmetainfo.cpp.orig 2008-04-17 13:00:09.000000000 +0200
+++ kdebase-runtime-4.0.3/khelpcenter/docmetainfo.cpp 2008-04-17 12:56:21.000000000 +0200
@@ -140,7 +140,7 @@ void DocMetaInfo::scanMetaInfo( bool for
if ( metaInfos.isEmpty() ) {
KStandardDirs* kstd = KGlobal::dirs();
- kstd->addResourceType( "data", 0, QLatin1String("share/apps/khelpcenter") );
+ kstd->addResourceType( "data", 0, QLatin1String("share/kde4/apps/khelpcenter") );
metaInfos = kstd->findDirs( "data", "plugins" );
}
for( it = metaInfos.begin(); it != metaInfos.end(); ++it) {
kdebase-runtime-4.0.3-pulseaudio.patch:
--- NEW FILE kdebase-runtime-4.0.3-pulseaudio.patch ---
diff -ur kdebase-runtime-4.0.3/phonon/xine/xineengine.cpp kdebase-runtime-4.0.3-pulseaudio/phonon/xine/xineengine.cpp
--- kdebase-runtime-4.0.3/phonon/xine/xineengine.cpp 2008-03-27 21:34:21.000000000 +0100
+++ kdebase-runtime-4.0.3-pulseaudio/phonon/xine/xineengine.cpp 2008-04-07 22:46:35.000000000 +0200
@@ -537,9 +537,9 @@
"in KDE2 and KDE3. Its use is discouraged.</p></html>"),
/*icon name */"audio-backend-arts", outputPlugins[i], QStringList(), QString());
} else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
- addAudioOutput(nextIndex++, 10, i18n("PulseAudio"),
+ addAudioOutput(nextIndex++, 2000, i18n("PulseAudio"),
xine_get_audio_driver_plugin_description(xine(), outputPlugins[i]),
- /*icon name */"audio-backend-pulseaudio", outputPlugins[i], QStringList(), QString(), true /*isAdvanced*/);
+ /*icon name */"audio-backend-pulseaudio", outputPlugins[i], QStringList(), QString());
} else if (0 == strcmp(outputPlugins[i], "esd")) {
addAudioOutput(nextIndex++, 8, i18n("Esound (ESD)"),
xine_get_audio_driver_plugin_description(xine(), outputPlugins[i]),
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 9 Mar 2008 01:43:12 -0000 1.6
+++ .cvsignore 22 Apr 2008 18:36:39 -0000 1.7
@@ -1,3 +1 @@
-kdebase-runtime-4.0.0.tar.bz2
-kdebase-runtime-4.0.1.tar.bz2
-kdebase-runtime-4.0.2.tar.bz2
+kdebase-runtime-4.0.3.tar.bz2
Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/kdebase-runtime.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdebase-runtime.spec 9 Mar 2008 01:43:12 -0000 1.5
+++ kdebase-runtime.spec 22 Apr 2008 18:36:39 -0000 1.6
@@ -8,17 +8,27 @@
Name: kdebase-runtime
Summary: K Desktop Environment - Runtime
-Version: 4.0.2
-Release: 3%{?dist}
+Version: 4.0.3
+Release: 10%{?dist}
License: GPLv2
Group: User Interface/Desktops
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
-# KDE 3 version of this service description
Source1: khelpcenter.desktop
+# Don't crash if we don't have deinterlacing support in xine-lib (#440299)
+Patch0: kdebase-runtime-4.0.3-deinterlace-crash.patch
+Patch1: kdebase-runtime-4.0.3-pulseaudio.patch
+Patch2: kdebase-runtime-4.0.3-khelpcenter.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%ifarch noarch
+%define icons 1
+%define icons_svg 1
+%else
+%define rest 1
+%endif
+
Obsoletes: kdebase4-runtime < %{version}-%{release}
Provides: kdebase4-runtime = %{version}-%{release}
@@ -32,8 +42,6 @@
Requires: eject
%endif
-Provides: oxygen-icon-theme = %{version}-%{release}
-
BuildRequires: alsa-lib-devel
BuildRequires: cmake
BuildRequires: clucene-core-devel
@@ -65,10 +73,26 @@
provided by KDE 3 because of file and configuration setting conflicts.
%endif
+%package -n oxygen-icon-theme
+Summary: Oxygen icon theme
+Group: User Interface/Desktops
+%{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
+%description -n oxygen-icon-theme
+%{summary}.
+
+%package -n oxygen-icon-theme-scalable
+Summary: Oxygen icon theme, scalable(svg) icons
+Group: User Interface/Desktops
+Requires: oxygen-icon-theme = %{version}-%{release}
+%description -n oxygen-icon-theme-scalable
+%{summary}.
+
%prep
%setup -q -n kdebase-runtime-%{version}
-
+%patch0 -p1 -b .deinterlace-crash
+%patch1 -p1 -b .pulseaudio
+%patch2 -p1 -b .khelpcenter
%build
@@ -77,20 +101,37 @@
%{cmake_kde4} ..
popd
+%if 0%{?rest}
make %{?_smp_mflags} -C %{_target_platform}
+%endif
%install
rm -rf %{buildroot}
-mkdir -p %{buildroot}
+
+%if 0%{?rest}
make install DESTDIR=%{buildroot} -C %{_target_platform}
+%endif
+
+%if 0%{?icons}
+make install DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
+%else
+rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen
+%endif
-# omit gigantic oxygen scalable/svg icons, for now -- Rex
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv
+# omit hicolor index.theme, use one from hicolor-icon-theme
+rm -f %{buildroot}%{_kde4_iconsdir}/hicolor/index.theme
-## Unpackaged files
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
+%if 0%{?icons_svg}
+find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" > svg.list
+sed -e "s|^%{buildroot}||" svg.list > svg-include.list
+sed -e "s|^%{buildroot}|%exclude |" svg.list > svg-exclude.list
+%else
+find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | \
+ xargs --no-run-if-empty rm -fv
+%endif
+%if 0%{?rest}
%if 0%{?kde3_desktop}
# remove files which conflict with KDE 3
rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
@@ -170,6 +211,7 @@
# so we can't use desktop-file-install for it.
install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop
%endif
+%endif
%clean
@@ -179,16 +221,33 @@
%post
/sbin/ldconfig ||:
%{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :
%postun
/sbin/ldconfig ||:
%{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :
+%if 0%{?icons}
+%post -n oxygen-icon-theme
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
+%postun -n oxygen-icon-theme
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%endif
+
+%if 0%{?icons_svg}
+%post -n oxygen-icon-theme-scalable
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
+%postun -n oxygen-icon-theme-scalable
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%endif
+
+%if 0%{?rest}
%files
%defattr(-,root,root,-)
%{_kde4_bindir}/*
@@ -197,17 +256,17 @@
%{_kde4_datadir}/config.kcfg/
%{_datadir}/dbus-1/interfaces/*
%{_datadir}/dbus-1/services/*
-%{_kde4_iconsdir}/oxygen/
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_datadir}/sounds/*
-%{_kde4_docdir}/HTML/en/
+%{_kde4_docdir}/HTML/en/*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/libexec/*
+%{_kde4_libexecdir}/*
%{_kde4_libdir}/kde4/plugins/styles/
%{_libdir}/strigi/*
%{_mandir}/man1/*
+%{_kde4_iconsdir}/hicolor/*/*/*
%if 0%{?kde3_desktop} == 0
%{_kde4_sysconfdir}/xdg/menus/kde-information.menu
@@ -221,9 +280,58 @@
%{_kde4_datadir}/locale/l10n/*/entry.desktop
%{_datadir}/services/khelpcenter.desktop
%endif
+%endif
+
+%if 0%{?icons}
+%files -n oxygen-icon-theme %{?icons_svg:-f svg-exclude.list}
+%defattr(-,root,root,-)
+%{_kde4_iconsdir}/oxygen/
+
+%if 0%{?icons_svg}
+%files -n oxygen-icon-theme-scalable -f svg-include.list
+%defattr(-,root,root,-)
+%endif
+%endif
%changelog
+* Thu Apr 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-10
+- oxygen-icon-theme: build noarch
+
+* Thu Apr 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-9
+- %%post/%%postun: hicolor icon theme scriptlets
+
+* Thu Apr 17 2008 Than Ngo <than at redhat.com> 4.0.3-8
+- only omit hicolor index.theme (#439374)
+
+* Thu Apr 17 2008 Than Ngo <than at redhat.com> 4.0.3-7
+- fix khelpcenter, search plugins/settings in correct path (#443016)
+
+* Tue Apr 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-6
+- respin (at f13's request)
+
+* Mon Apr 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-5
+- pulseaudio patch (use as default, if available)
+
+* Sat Apr 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-4
+- don't crash if we don't have deinterlacing support in xine-lib (#440299)
+
+* Thu Apr 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-3
+- rebuild for the new %%{_kde4_buildtype}
+
+* Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-2
+- update file list for _kde4_libexecdir
+
+* Fri Mar 28 2008 Than Ngo <than at redhat.com> 4.0.3-1
+- 4.0.3
+
+* Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-5
+- don't own %%_kde4_docdir/HTML/en/
+
+* Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-4
+- oxygen-icon-theme, oxygen-icon-theme-scalable pkgs
+- include noarch build hooks (not enabled)
+
* Fri Mar 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-3
- BR libxcb-devel everywhere (including F7)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 9 Mar 2008 01:43:12 -0000 1.6
+++ sources 22 Apr 2008 18:36:39 -0000 1.7
@@ -1 +1 @@
-28d979899554d731e20d4b88b44092ae kdebase-runtime-4.0.2.tar.bz2
+41a47f084ed47c6e44b1a582d2a88fe0 kdebase-runtime-4.0.3.tar.bz2
- Previous message (by thread): rpms/libwiimote/F-9 libwiimote-0.4-libs.patch, NONE, 1.1 libwiimote.spec, 1.4, 1.5
- Next message (by thread): rpms/kdebase-runtime/F-8 kdebase-runtime-4.0.3-deinterlace-crash.patch, NONE, 1.1 kdebase-runtime-4.0.3-khelpcenter.patch, NONE, 1.1 kdebase-runtime-4.0.3-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kdebase-runtime.spec, 1.5, 1.6 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list