* Tue Dec 16 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.85-5

- respun tarball, integrates kde-l10n-systemsettings patch
This commit is contained in:
Rex Dieter 2008-12-16 19:35:48 +00:00
parent ccf40d26c9
commit 0c2fefe984
4 changed files with 5 additions and 53 deletions

View File

@ -1,2 +1 @@
kdelibs-4.1.82.tar.bz2
kdelibs-4.1.85.tar.bz2

View File

@ -1,48 +0,0 @@
diff -up kdelibs-4.1.85/kdoctools/customization/gl/user.entities.orig kdelibs-4.1.85/kdoctools/customization/gl/user.entities
--- kdelibs-4.1.85/kdoctools/customization/gl/user.entities.orig 2008-12-15 15:36:33.000000000 +0100
+++ kdelibs-4.1.85/kdoctools/customization/gl/user.entities 2008-12-15 15:37:49.000000000 +0100
@@ -28,6 +28,7 @@
<!ENTITY RMB "botón <mousebutton>dereito</mousebutton> do rato">
<!ENTITY OS "sistema operativo">
<!ENTITY Shift "<keycap>Maiúsc</keycap>">
+<!ENTITY systemsettings "<application>Configuración do Sistema</application>">
<!ENTITY Tab "<keycap>Tab</keycap>">
<!ENTITY kicon '<guiicon>
<inlinemediaobject>
@@ -42,4 +43,4 @@
<!ENTITY kleopatra "<application>Kleopatra</application>" >
<!ENTITY qt "<trademark>Qt</trademark>" >
<!ENTITY TODO "Pendente de facer">
-<!ENTITY X-Windows "Sistema de fiestras X">
\ Kein Zeilenumbruch am Dateiende.
+<!ENTITY X-Windows "Sistema de fiestras X">
diff -up kdelibs-4.1.85/kdoctools/customization/ru/user.entities.orig kdelibs-4.1.85/kdoctools/customization/ru/user.entities
--- kdelibs-4.1.85/kdoctools/customization/ru/user.entities.orig 2008-12-15 15:38:01.000000000 +0100
+++ kdelibs-4.1.85/kdoctools/customization/ru/user.entities 2008-12-15 15:39:33.000000000 +0100
@@ -39,3 +39,4 @@
<!ENTITY Ctrl "<keycap>Ctrl</keycap>">
<!ENTITY eg "<abbrev>e.g.</abbrev>">
<!ENTITY ie "<abbrev>i.e.</abbrev>">
+<!ENTITY systemsettings "<application>Параметры системы</application>">
diff -up kdelibs-4.1.85/kdoctools/customization/es/user.entities.orig kdelibs-4.1.85/kdoctools/customization/es/user.entities
--- kdelibs-4.1.85/kdoctools/customization/es/user.entities.orig 2008-12-15 15:04:28.000000000 +0100
+++ kdelibs-4.1.85/kdoctools/customization/es/user.entities 2008-12-15 15:06:06.000000000 +0100
@@ -39,6 +39,7 @@
<!ENTITY OS "Sistema operativo">
<!ENTITY RMB "<mousebutton>botón derecho</mousebutton>">
<!ENTITY Shift "<keycap>Mayúsculas</keycap>">
+<!ENTITY systemsettings "<application>Preferencias del sistema</application>">
<!ENTITY Tab "<keycap>Tab</keycap>">
<!ENTITY TODO "Pendiente">
<!ENTITY X-Windows "Sistema de ventanas X">
diff -up kdelibs-4.1.85/kdoctools/customization/pt/user.entities.orig kdelibs-4.1.85/kdoctools/customization/pt/user.entities
--- kdelibs-4.1.85/kdoctools/customization/pt/user.entities.orig 2008-12-16 17:24:52.000000000 +0100
+++ kdelibs-4.1.85/kdoctools/customization/pt/user.entities 2008-12-16 17:26:26.000000000 +0100
@@ -28,6 +28,7 @@
<!ENTITY RMB "botão <mousebutton>direito</mousebutton> do rato">
<!ENTITY OS "sistema operativo">
<!ENTITY Shift "<keycap>Shift</keycap>">
+<!ENTITY systemsettings "<application>Configuração do Sistema</application>">
<!ENTITY Tab "<keycap>Tab</keycap>">
<!ENTITY kicon '<guiicon>
<inlinemediaobject>

View File

@ -1,6 +1,6 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.1.85
Release: 4%{?dist}
Release: 5%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -71,7 +71,6 @@ Patch14: kdelibs-4.0.85-libexecdir.patch
# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
Patch18: kdelibs-4.1.72-kstandarddirs.patch
Patch20: kdelibs-4.1.70-cmake.patch
Patch21: kdelibs-4.1.85-kde-l10n-systemsettings.patch
BuildRequires: qt4-devel >= 4.4.0
Requires: qt4 >= %{_qt4_version}
@ -195,7 +194,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch14 -p1 -b .libexecdir
%patch18 -p1 -b .kstandarddirs
%patch20 -p1 -b .xxcmake
%patch21 -p1 -b .kde-l10n-es
%build
@ -357,6 +355,9 @@ rm -rf %{buildroot}
%changelog
* Tue Dec 16 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.85-5
- respun tarball, integrates kde-l10n-systemsettings patch
* Tue Dec 16 2008 Than Ngo <than@redhat.com> - 4.1.85-4
- add missing ENTITY systemsettings in pt, that fixes kde-l10
build breakage

View File

@ -1 +1 @@
312597e801622e4b0e9208d466ec1b98 kdelibs-4.1.85.tar.bz2
fe9a4c2fdf7b0b6dfe77e992d1358adc kdelibs-4.1.85.tar.bz2