add udisks2 Solid backend plus RHEL conditional

This commit is contained in:
Lukas Tinkl 2012-04-16 19:50:29 +02:00
parent 1d67fe3668
commit 7dbe0c221e
2 changed files with 3674 additions and 1 deletions

File diff suppressed because it is too large Load Diff

View File

@ -20,7 +20,7 @@
Summary: KDE Libraries Summary: KDE Libraries
Version: 4.8.2 Version: 4.8.2
Release: 2%{?dist} Release: 3%{?dist}
Name: kdelibs Name: kdelibs
Epoch: 6 Epoch: 6
@ -142,6 +142,8 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
## Fedora specific patches ## Fedora specific patches
# make forcefully hal-free build # make forcefully hal-free build
Patch300: kdelibs-4.7.3-halectomy.patch Patch300: kdelibs-4.7.3-halectomy.patch
# udisks2 Solid backend, halectomy
Patch301: kdelibs-udisks2-backend.patch
# force upgrade of apps using the discontinued KatePart Smart* interfaces to # force upgrade of apps using the discontinued KatePart Smart* interfaces to
# versions using the new Moving* interfaces instead # versions using the new Moving* interfaces instead
@ -330,7 +332,14 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch200 -p1 -b .CVE-2009-2702 %patch200 -p1 -b .CVE-2009-2702
# Fedora patches # Fedora patches
%if 0%{?fedora}
%patch300 -p1 -b .halectomy %patch300 -p1 -b .halectomy
%endif
%if 0%{?rhel}
pushd solid
%patch301 -p4 -b .udisks2backend
popd
%endif
%build %build
@ -578,6 +587,9 @@ rm -rf %{buildroot}
%changelog %changelog
* Mon Apr 16 2012 Lukas Tinkl <ltinkl@redhat.com> - 6:4.8.2-3
- add udisks2 Solid backend plus RHEL conditional
* Thu Apr 12 2012 Than Ngo <than@redhat.com> - 6:4.8.2-2 * Thu Apr 12 2012 Than Ngo <than@redhat.com> - 6:4.8.2-2
- Load/Update filter lists only when AdBlock is enabled - Load/Update filter lists only when AdBlock is enabled