remove temporary patch, adjust whitespace

epel9
Rex Dieter 10 years ago
parent 6712cf7725
commit 8d022c761a

@ -1,12 +0,0 @@
diff -up kio-extras-5.2.2/mtp/kio_mtp.cpp.catalog kio-extras-5.2.2/mtp/kio_mtp.cpp
--- kio-extras-5.2.2/mtp/kio_mtp.cpp.catalog 2015-03-19 07:32:48.000000000 -0500
+++ kio-extras-5.2.2/mtp/kio_mtp.cpp 2015-04-07 07:12:12.867492391 -0500
@@ -44,7 +44,7 @@ extern "C"
int Q_DECL_EXPORT kdemain(int argc, char **argv)
{
QCoreApplication app(argc, argv);
- app.setApplicationName(QLatin1String("kio_mtp"));
+ app.setApplicationName(QLatin1String("kio_mtp5"));
if (argc != 4) {
fprintf(stderr, "Usage: kio_mtp protocol domain-socket1 domain-socket2\n");

@ -6,7 +6,6 @@ Summary: Additional components to increase the functionality of KIO Frame
License: GPLv2+ License: GPLv2+
URL: https://projects.kde.org/projects/kde/workspace/kio-extras URL: https://projects.kde.org/projects/kde/workspace/kio-extras
%global revision %(echo %{version} | cut -d. -f3) %global revision %(echo %{version} | cut -d. -f3)
%if %{revision} >= 50 %if %{revision} >= 50
%global stable unstable %global stable unstable
@ -15,10 +14,6 @@ URL: https://projects.kde.org/projects/kde/workspace/kio-extras
%endif %endif
Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
## downstream patches
# temporarily adjust translation catalog until kio_mtp updates hit stable
Patch1: kio-extras-5.2.2-mtp_catalog.patch
BuildRequires: kf5-rpm-macros BuildRequires: kf5-rpm-macros
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
@ -75,14 +70,6 @@ BuildArch: noarch
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
# temporary
%patch1 -p1 -b .mtp_catalog
for po in po/*/kio_mtp.po ; do
pushd $(dirname $po)
mv kio_mtp.po kio_mtp5.po
popd
done
%build %build
mkdir %{_target_platform} mkdir %{_target_platform}

Loading…
Cancel
Save