Skip to content

Commit

Permalink
[installer] [host] bump version and attempt to fix CentOS7 and RHEL7
Browse files Browse the repository at this point in the history
  • Loading branch information
@samnazarko
samnazarko committed Jan 11, 2015
1 parent ed63051 commit f179381
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
15 changes: 12 additions & 3 deletions installer/host/osmc-installer.spec
View file
Expand Up @@ -51,15 +51,24 @@ BuildRequires: gcc-c++

%if ! 0%{?suse_version}
# Common dependencies
Requires: libjpeg8
Requires: libmng
Requires: libtiff5
Requires: libpng12-0
Requires: qt
# Patch
Requires: patch
%endif

%if 0%{?centos_version} == 700 || 0%{?rhel_version} == 700
Requires: libjpeg-turbo
Requires: libtiff
Requires: libpng
%else
%if ! 0%{?suse_version}
Requires: libjpeg8
Requires: libtiff5
Requires: libpng12-0
%endif
%endif

# Don't make this noarch although it is just a fetch script otherwise the following wont' work:

# dep_postfix macro is used to append "-32bit" to dependencies for x86_64 on openSUSE
Expand Down
2 changes: 1 addition & 1 deletion installer/host/qt_host_installer/qt_host_installer.pro
View file
Expand Up @@ -91,7 +91,7 @@ FORMS += mainwindow.ui \
extractprogress.ui \
successdialog.ui

VERSION = 1.0.1
VERSION = 1.0.2

TRANSLATIONS = osmc.ts \
osmc_da.ts \
Expand Down

3 comments on commit f179381

@samnazarko
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@malkavi

Users have said they have had issues on CentOS7/RHEL7 installing the installer. This seems to fix it -- dependencies are no longer a problem, although running the application (GNOME 3), does not do anything.

Are we 100% sure that for OpenSUSE distributions we should be using 'libjpeg8/libtiff5/libpng12-0' packages?

@malkavi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"although running the application (GNOME 3), does not do anything"
That issue have to be from the launch script... but I'm not sure, I use KDE.

For OpenSUSE dependencies you can search at "http://software.opensuse.org/132/es"
or remove all the "Requires:" and the system will (have to) autoadd dependencies,
or maybe use something like:
Requires: pkgconfig(libjpeg)
instead of
Requires: libjpeg8

@samnazarko
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi

I think rhel_version based on https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto

I think using fedora on its own without checking for version is also fine, given Fedora has a 6 month release cycle. I don't use RPM distros or have much experience with RPM packaging so would appreciate some guidance here

Merged.

Sam

Please sign in to comment.