| a84a6c17 | 2018-07-15 16:01:04 | François Andriot |
RPM: update build scripts for Opensuse TumbleWeed |
||
|
M redhat/Makefile.r14 M redhat/applications/amarok/amarok-14.0.0.spec M redhat/applications/k3b/k3b-14.0.0.spec M redhat/applications/koffice/koffice-14.0.0.spec M redhat/applications/tellico/tellico-14.0.0.spec M redhat/docker/osstw/packages M redhat/main/tdegraphics/tdegraphics-14.0.0.spec |
||
redhat/Makefile.r14diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 81225cd..ac8148e 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -211,7 +211,7 @@ lcms: # Build on EL7, OSSTW -ifeq (,$(filter $(DIST),.el7 osstw)) +ifneq (,$(filter $(DIST),.el7 .osstw)) $(call buildpkg,3rdparty/lcms) endif @@ -280,7 +280,7 @@ recode: # Build on OpenSUSE >= 15.0 only -ifneq (,$(filter $(DIST),.oss150)) +ifneq (,$(filter $(DIST),.oss150 .osstw)) $(call buildpkg,3rdparty/recode) endif @@ -624,7 +624,7 @@ kstreamripper: tdebase # Do NOT build on Fedora 27, OpenSUSE >= 15.0 (problem with scons and python3) -ifeq (,$(filter $(DIST),.fc27 .oss150)) +ifeq (,$(filter $(DIST),.fc27 .oss150 .osstw)) $(call buildpkg,applications/kstreamripper) endif @@ -830,7 +830,7 @@ klibido: pan # Not on RHEL5, nor recent OpenSUSE -ifeq (,$(filter $(DIST),.el5 .oss150)) +ifeq (,$(filter $(DIST),.el5 .oss150 .osstw)) $(call buildpkg,extras/klibido) endif @@ -853,7 +853,7 @@ $(call buildpkg,extras/mathemagics) pan: gmime intltool -ifeq (,$(filter $(DIST),.el5 .oss150)) +ifeq (,$(filter $(DIST),.el5 .oss150 .osstw))) $(call buildpkg,3rdparty/pan) endif redhat/applications/amarok/amarok-14.0.0.specdiff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec index 41ef745..a18b8f5 100644 --- a/redhat/applications/amarok/amarok-14.0.0.spec +++ b/redhat/applications/amarok/amarok-14.0.0.spec @@ -191,7 +191,7 @@ %if 0%{?mgaversion} && 0%{?mgaversion} <= 2
BuildRequires: libtunepimp-devel %endif -%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} != 1500
+%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} < 1500
BuildRequires: libtunepimp-devel %endif %if 0%{?fedora} && 0%{?fedora} <= 23
redhat/applications/kdiff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec index a0975d1..5bc2c6e 100644 --- a/redhat/applications/k3b/k3b-14.0.0.spec +++ b/redhat/applications/k3b/k3b-14.0.0.spec @@ -110,7 +110,7 @@ Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1500
+%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500
Requires: wodim REquires: genisoimage %else redhat/applications/koffice/koffice-14.0.0.specdiff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 78026fb..1404ebb 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -177,7 +177,7 @@ # POPPLER support %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-%if 0%{?suse_version} == 1500
+%if 0%{?suse_version} >= 1500
BuildRequires: libpoppler-devel >= 0.12 %else BuildRequires: poppler-devel >= 0.12 @@ -194,7 +194,7 @@ # POSTGRESQL support # Requires 'libpqxx', for kexi-driver-pgqsl %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-%if 0%{?suse_version} != 1500
+%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550
%define with_postgresql 1 BuildRequires: postgresql-devel BuildRequires: libpqxx-devel redhat/applications/tellico/tellico-14.0.0.specdiff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec index a8cf495..8cb0aae 100644 --- a/redhat/applications/tellico/tellico-14.0.0.spec +++ b/redhat/applications/tellico/tellico-14.0.0.spec @@ -76,7 +76,7 @@ # POPPLER support %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-%if 0%{?suse_version} == 1500
+%if 0%{?suse_version} >= 1500
BuildRequires: libpoppler-devel >= 0.12 %else BuildRequires: poppler-devel >= 0.12 redhat/docker/osstw/packagesdiff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index 68478e1..29ccaf5 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -28,6 +28,7 @@ doxygen GraphicsMagick dssi-devel fdupes +ffmpeg-devel fftw3-devel file-devel flac-devel @@ -138,6 +139,7 @@ lilo lirc-devel make +makeinfo meanwhile-devel Mesa-devel Mesa-libGL-devel @@ -159,6 +161,7 @@ postgresql postgresql-devel python-devel +qt-devel rpcgen rpm-build rsvg-view @@ -171,6 +174,7 @@ subversion-devel sudo swig +sword-devel torsocks transfig unixODBC-devel redhat/main/tdegraphics/tdegraphics-14.0.0.specdiff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec index 2811f76..18feb8d 100644 --- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec +++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec @@ -199,7 +199,7 @@ %define with_pdf 1 %if 0%{?with_pdf}
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-%if 0%{?suse_version} == 1500
+%if 0%{?suse_version} >= 1500
BuildRequires: libpoppler-devel >= 0.12 %else BuildRequires: poppler-devel >= 0.12 |
||
| 1794d3e6 | 2018-07-15 16:01:04 | François Andriot |
RPM: add TDM/TDE alternatives in YAST2 for opensuse >= 15.0 |
||
|
M redhat/main/tdebase/tdebase-14.0.0.spec |
||
redhat/main/tdebase/tdebase-14.0.0.specdiff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 36a25ee..57984fe 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -2293,6 +2293,10 @@ cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm"
fi +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500
+update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager default-displaymanager /usr/lib/X11/displaymanagers/tdm 30 || : +%endif %posttrans -n trinity-tdm # Make sure that TDM configuration files are now under '/etc/trinity/tdm' @@ -2304,6 +2308,11 @@ %postun -n trinity-tdm %if 0%{?mgaversion} || 0%{?mdkversion}
%make_session +%endif + +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500
+update-alternatives --remove default-displaymanager /usr/lib/X11/displaymanagers/tdm || : %endif ########## @@ -2903,11 +2912,21 @@ fndSession %endif +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500
+update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || : +%endif + %postun -n trinity-ksmserver %if 0%{?mdkversion} || 0%{?mgaversion}
fndSession %endif +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500
+update-alternatives --remove default-xsession.desktop /usr/share/xsessions/tde.desktop || : +%endif + ########## %package -n trinity-ksplash |
||
| 2f28732a | 2018-07-15 16:01:04 | François Andriot |
RPM: fix kdcop.desktop category for opensuse |
||
|
M redhat/main/tdebase/tdebase-14.0.0.spec |
||
redhat/main/tdebase/tdebase-14.0.0.specdiff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 57984fe..8f8257d 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -3601,6 +3601,9 @@ %{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop Applet X-TDE-settings-desktop}
%suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager
%endif +if [ -r %{?buildroot}%{tde_tdeappdir}/kdcop.desktop ]; then
+%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kdcop.desktop System Utility
+fi # Icons from TDE Control Center should only be displayed in TDE for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do |
||