Note: This is a public test instance of Red Hat Bugzilla. The data contained within is a snapshot of the live data so any changes you make will not be reflected in the production Bugzilla. Email is disabled so feel free to test any aspect of the site that you want. File any problems you find or give feedback at bugzilla.redhat.com.
Bug 1383274 - wrong ninja.vim content
Summary: wrong ninja.vim content
Keywords:
Status: CLOSED ERRATA
Alias: None
Product: Fedora
Classification: Fedora
Component: ninja-build
Version: 25
Hardware: Unspecified
OS: Unspecified
unspecified
unspecified
Target Milestone: ---
Assignee: Ben Boeckel
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2016-10-10 10:33 UTC by Christophe Fergeau
Modified: 2016-10-18 11:31 UTC (History)
3 users (show)

Fixed In Version: ninja-build-1.7.1-3.fc24 ninja-build-1.7.1-3.fc25
Doc Type: If docs needed, set a value
Doc Text:
Clone Of:
Environment:
Last Closed: 2016-10-13 21:53:34 UTC
Type: Bug
Embargoed:


Attachments (Terms of Use)

Description Christophe Fergeau 2016-10-10 10:33:29 UTC
Since the addition of the RPM macros for ninja, the vim plugin is broken.
I fixed it with this patch:

diff --git a/ninja-build.spec b/ninja-build.spec
index dc0a595..7f4a6e6 100644
--- a/ninja-build.spec
+++ b/ninja-build.spec
@@ -1,11 +1,12 @@
 Name:           ninja-build
 Version:        1.7.1
-Release:        2%{?dist}
+Release:        2%{?dist}.0.teuf
 Summary:        A small build system with a focus on speed
 License:        ASL 2.0
 URL:            http://martine.github.com/ninja/
 Source0:        https://github.com/martine/ninja/archive/v%{version}.tar.gz#/ninja-%{version}.tar.gz
-Source1:        macros.ninja
+Source1:        ninja.vim
+Source2:        macros.ninja
 # Rename mentions of the executable name to be ninja-build.
 Patch1000:      ninja-1.7.1-binary-rename.patch
 # Disable a test which takes too many resources for koji.
@@ -26,6 +27,7 @@ fast as possible.
 %prep
 %autosetup -n ninja-%{version} -p1
 cp -p %{SOURCE1} .
+cp -p %{SOURCE2} .

 %build
 CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" \
@@ -41,7 +43,7 @@ install -Dpm0644 misc/ninja-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/ninj
 install -Dpm0644 misc/ninja.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/ninja.vim
 install -Dpm0644 %{SOURCE1} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/ninja.vim
 install -Dpm0644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja
-install -Dpm0644 macros.ninja %{buildroot}%{rpmmacrodir}/macros.ninja
+install -Dpm0644 %{SOURCE2} %{buildroot}%{rpmmacrodir}/macros.ninja

 %check
 ./ninja_test

Comment 1 Fedora Update System 2016-10-12 00:55:57 UTC
meson-0.35.0-3.fc24, ninja-build-1.7.1-3.fc24 has been pushed to the Fedora 24 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2016-672d472d8e

Comment 2 Fedora Update System 2016-10-12 01:53:26 UTC
meson-0.35.0-3.fc25, ninja-build-1.7.1-3.fc25 has been pushed to the Fedora 25 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2016-60e8c56265

Comment 3 Fedora Update System 2016-10-13 21:53:34 UTC
meson-0.35.0-3.fc24, ninja-build-1.7.1-3.fc24 has been pushed to the Fedora 24 stable repository. If problems still persist, please make note of it in this bug report.

Comment 4 Fedora Update System 2016-10-18 11:31:24 UTC
meson-0.35.0-3.fc25, ninja-build-1.7.1-3.fc25 has been pushed to the Fedora 25 stable repository. If problems still persist, please make note of it in this bug report.


Note You need to log in before you can comment on or make changes to this bug.