summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qelectrotech.spec10
-rw-r--r--r4224-scorpio810.diff13
2 files changed, 3 insertions, 20 deletions
diff --git a/qelectrotech.spec b/qelectrotech.spec
index d814bd4..a5da976 100644
--- a/qelectrotech.spec
+++ b/qelectrotech.spec
@@ -49,10 +49,6 @@ Source0: qelectrotech-%{upver}-svn%{?svnrel}.tgz
Source0: http://download.tuxfamily.org/qet/tags/%{rdate}/qelectrotech-%{upver}-src.tar.gz
%endif
-# Stupid change, to revert
-# or switch to qmake-qt5 'QMAKE_COPY_DIR = cp -f -r --preserve=timestamps' qelectrotech.pro
-Patch0: r4224-scorpio810.diff
-
BuildRequires: desktop-file-utils
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtsvg-devel
@@ -157,14 +153,14 @@ Colecção de elementos para QElectroTech.
%setup -q -n %{name}-%{upver}-src
%endif
-%patch0 -p1 -R
-
sed -e s,/usr/local/,%{_prefix}/, \
-e /QET_MAN_PATH/s,'man/','share/man', \
-e /QET_MIME/s,../,, \
-i %{name}.pro
-qmake-qt5 %{name}.pro
+qmake-qt5 \
+ 'QMAKE_COPY_DIR = cp -f -r --preserve=timestamps' \
+ qelectrotech.pro
%build
diff --git a/r4224-scorpio810.diff b/r4224-scorpio810.diff
deleted file mode 100644
index 47043ac..0000000
--- a/r4224-scorpio810.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Modified: trunk/qelectrotech.pro
-===================================================================
---- trunk/qelectrotech.pro 2015-10-03 15:41:59 UTC (rev 4223)
-+++ trunk/qelectrotech.pro 2015-10-03 16:28:11 UTC (rev 4224)
-@@ -203,7 +203,4 @@
- DEFINES += QET_COMMON_COLLECTION_PATH_RELATIVE_TO_BINARY_PATH
- }
-
--# Compilers-specific options
--unix {
-- QMAKE_COPY_DIR = 'cp -f -r --preserve=timestamps'
--}
-+