* Wed Jan 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.95-3
- patch for kde4-config --kde-version option - kdelibs.macros: provide %{_kde4_version} macro
This commit is contained in:
parent
8b4715f671
commit
92058f17ef
21
kdelibs-4.3.95-kde-config_kde-version.patch
Normal file
21
kdelibs-4.3.95-kde-config_kde-version.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
diff -up kdelibs-4.3.95/kdecore/kde-config.cpp.kde_version kdelibs-4.3.95/kdecore/kde-config.cpp
|
||||||
|
--- kdelibs-4.3.95/kdecore/kde-config.cpp.kde_version 2009-10-15 11:35:55.000000000 -0500
|
||||||
|
+++ kdelibs-4.3.95/kdecore/kde-config.cpp 2010-01-27 10:57:31.049902203 -0600
|
||||||
|
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
|
||||||
|
options.add("exec-prefix", ki18n("Compiled in exec_prefix for KDE libraries"));
|
||||||
|
options.add("libsuffix", ki18n("Compiled in library path suffix"));
|
||||||
|
options.add("localprefix", ki18n("Prefix in $HOME used to write files"));
|
||||||
|
- options.add("version", ki18n("Compiled in version string for KDE libraries"));
|
||||||
|
+ options.add("kde-version", ki18n("Compiled in version string for KDE libraries"));
|
||||||
|
options.add("types", ki18n("Available KDE resource types"));
|
||||||
|
options.add("path type", ki18n("Search path for resource type"));
|
||||||
|
options.add("locate filename", ki18n("Find filename inside the resource type given to --path"));
|
||||||
|
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (args->isSet("version"))
|
||||||
|
+ if (args->isSet("kde-version"))
|
||||||
|
{
|
||||||
|
printf("%s\n", KDE_VERSION_STRING);
|
||||||
|
return 0;
|
17
kdelibs.spec
17
kdelibs.spec
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.3.95
|
Version: 4.3.95
|
||||||
Release: 1%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -86,6 +86,10 @@ Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
|
|||||||
# MUST BE UPSTREAMED!
|
# MUST BE UPSTREAMED!
|
||||||
Patch27: kdelibs-4.3.90-kauth-polkitqt1.patch
|
Patch27: kdelibs-4.3.90-kauth-polkitqt1.patch
|
||||||
|
|
||||||
|
# upstreamable
|
||||||
|
# new kde4-config --kde-version option (replaces previously ambiguous --version)
|
||||||
|
Patch50: kdelibs-4.3.95-kde-config_kde-version.patch
|
||||||
|
|
||||||
# upstream
|
# upstream
|
||||||
# awol lstat declaration
|
# awol lstat declaration
|
||||||
Patch100: kdelibs-4.3.90-headers.patch
|
Patch100: kdelibs-4.3.90-headers.patch
|
||||||
@ -180,6 +184,7 @@ Provides: kdelibs4-devel = %{version}-%{release}
|
|||||||
%{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
|
%{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
|
||||||
Obsoletes: kdelibs-experimental-devel < 4.3.75
|
Obsoletes: kdelibs-experimental-devel < 4.3.75
|
||||||
Provides: kdelibs-experimental-devel = %{version}-%{release}
|
Provides: kdelibs-experimental-devel = %{version}-%{release}
|
||||||
|
Obsoletes: webkitkde-devel < 0.0.3
|
||||||
Requires: attica-devel >= %{attica_ver}
|
Requires: attica-devel >= %{attica_ver}
|
||||||
Requires: automoc4 >= 0.9.88
|
Requires: automoc4 >= 0.9.88
|
||||||
Requires: cmake >= 2.6.2-3
|
Requires: cmake >= 2.6.2-3
|
||||||
@ -234,6 +239,9 @@ format for easy browsing.
|
|||||||
%endif
|
%endif
|
||||||
%patch27 -p1 -b .kauth-polkitqt1
|
%patch27 -p1 -b .kauth-polkitqt1
|
||||||
|
|
||||||
|
# upstreamable patches
|
||||||
|
%patch50 -p1 -b .kde-config_kde-version
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch100 -p1 -b .headers
|
%patch100 -p1 -b .headers
|
||||||
|
|
||||||
@ -445,6 +453,13 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.95-3
|
||||||
|
- patch for kde4-config --kde-version option
|
||||||
|
- kdelibs.macros: provide %%{_kde4_version} macro
|
||||||
|
|
||||||
|
* Tue Jan 26 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.95-2
|
||||||
|
- -devel: Obsoletes: webkitkde-devel
|
||||||
|
|
||||||
* Wed Jan 20 2010 Lukas Tinkl <ltinkl@redhat.com> - 4.3.95-1
|
* Wed Jan 20 2010 Lukas Tinkl <ltinkl@redhat.com> - 4.3.95-1
|
||||||
- KDE 4.3.95 (4.4rc2)
|
- KDE 4.3.95 (4.4rc2)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user