|
[-]
[+]
|
Changed |
_service:tar_git:qtchooser.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -1,7 +1,7 @@
<services>
<service name="webhook">
<param name="repourl">https://git.merproject.org/Kaffeine/qtchooser.git</param>
- <param name="branch">master</param>
+ <param name="branch">slots</param>
<param name="build">true</param>
<param name="notify">true</param>
<param name="comment"/>
@@ -9,7 +9,7 @@
</service>
<service name="tar_git">
<param name="url">https://git.merproject.org/Kaffeine/qtchooser.git</param>
- <param name="branch">master</param>
+ <param name="branch">slots</param>
<param name="revision">HEAD</param>
<param name="token"/>
<param name="debian">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:macros.qmake
^
|
| @@ -1,32 +0,0 @@
-#
-# QMake macros
-#
-
-%qmake \
- export QT_SELECT=4; \\\
- qmake -qt=4 -makefile \\\
- "QMAKE_CFLAGS_RELEASE=${CFLAGS:-%optflags}" \\\
- "QMAKE_CFLAGS_DEBUG=${CFLAGS:-%optflags}" \\\
- "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS:-%optflags}" \\\
- "QMAKE_CXXFLAGS_DEBUG=${CXXFLAGS:-%optflags}" \\\
- QMAKE_STRIP=: \\\
- PREFIX=%{_prefix}
-
-%qmake5 \
- export QT_SELECT=5; \\\
- qmake -qt=5 -makefile \\\
- "QMAKE_CFLAGS_RELEASE=${CFLAGS:-%optflags}" \\\
- "QMAKE_CFLAGS_DEBUG=${CFLAGS:-%optflags}" \\\
- "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS:-%optflags}" \\\
- "QMAKE_CXXFLAGS_DEBUG=${CXXFLAGS:-%optflags}" \\\
- %if 0%{?qa_stage_devel:1} \
- DEFINES+=QT_MESSAGELOGCONTEXT \\\
- %endif \
- QMAKE_STRIP=: \\\
- PREFIX=%{_prefix}
-
-# qt4 specific install macro
-%qmake_install export QT_SELECT=4; make install INSTALL_ROOT=%{buildroot}
-
-# qt5 specific install macro
-%qmake5_install export QT_SELECT=5; make install INSTALL_ROOT=%{buildroot}
|
