diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-15 22:20:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-15 22:20:03 +0200 |
| commit | 21e475b64b2eaadfc9f5209562d008999417ee7d (patch) | |
| tree | cc4aaddfc75f60751c3c1ccc0c7a41343ae7b6ad /mesonbuild/modules/rpm.py | |
| parent | 925f880e6ba4155a9a2d9b075cde20eff25039ca (diff) | |
| parent | ff8cdf86f4a36290156424bfeb5efbde788a5953 (diff) | |
| download | meson-21e475b64b2eaadfc9f5209562d008999417ee7d.zip meson-21e475b64b2eaadfc9f5209562d008999417ee7d.tar.gz meson-21e475b64b2eaadfc9f5209562d008999417ee7d.tar.bz2 | |
Merge pull request #1194 from centricular/critical-bugfixes-vala
A bunch of bugfixes for Vala
Diffstat (limited to 'mesonbuild/modules/rpm.py')
| -rw-r--r-- | mesonbuild/modules/rpm.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/modules/rpm.py b/mesonbuild/modules/rpm.py index dca1ad6..a0f79aa 100644 --- a/mesonbuild/modules/rpm.py +++ b/mesonbuild/modules/rpm.py @@ -19,7 +19,7 @@ from .. import build from .. import compilers import datetime from .. import mlog -from ..modules import gnome +from . import GirTarget, TypelibTarget import os @@ -65,9 +65,9 @@ class RPMModule: to_delete.add('%%{buildroot}%%{_libdir}/%s' % target.get_filename()) mlog.warning('removing', mlog.bold(target.get_filename()), 'from package because packaging static libs not recommended') - elif isinstance(target, gnome.GirTarget) and target.should_install(): + elif isinstance(target, GirTarget) and target.should_install(): files_devel.add('%%{_datadir}/gir-1.0/%s' % target.get_filename()[0]) - elif isinstance(target, gnome.TypelibTarget) and target.should_install(): + elif isinstance(target, TypelibTarget) and target.should_install(): files.add('%%{_libdir}/girepository-1.0/%s' % target.get_filename()[0]) for header in state.headers: if len(header.get_install_subdir()) > 0: |