#1 New version
Merged 2 years ago by jskarvad. Opened 2 years ago by jskarvad.
rpms/ jskarvad/halibut rawhide  into  rawhide

file modified
+1 -3
@@ -1,3 +1,1 @@ 

- halibut-*.tar.bz2

- /halibut-1.1.tar.gz

- /halibut-1.2.tar.gz

+ /halibut-*.tar.gz

file modified
+20 -20
@@ -1,12 +1,14 @@ 

  Name:		halibut

  Summary:	TeX-like software manual tool

- Version:	1.2

- Release:	13%{?dist}

+ Version:	1.3

+ Release:	1%{?dist}

  License:	MIT and APAFML

  URL:		http://www.chiark.greenend.org.uk/~sgtatham/halibut.html

- Source0:	http://www.chiark.greenend.org.uk/~sgtatham/halibut/%{name}-%{version}.tar.gz

- BuildRequires:	gcc, perl-interpreter

- BuildRequires: make

+ Source0:	http://www.chiark.greenend.org.uk/~sgtatham/halibut/%{name}-%{version}/%{name}-%{version}.tar.gz

+ BuildRequires:	gcc

+ BuildRequires:	perl-interpreter

+ BuildRequires:	make

+ BuildRequires:	cmake

  

  %description

  Halibut is yet another text formatting system, intended primarily for
@@ -25,27 +27,21 @@ 

  This package provides vim syntax support for Halibut input files (*.but).

  

  %prep

- %setup -q

+ %autosetup -p1

  

  %build

- sed -i 's/CFLAGS += -g/CFLAGS += /g' Makefile

- #export CFLAGS="%{optflags}"

- # workaround to compile with gcc-10, problem reported upstream

- export CFLAGS="%{optflags} -fcommon"

- make %{?_smp_mflags} VERSION="%{version}"

- make -C doc

+ %cmake

+ %cmake_build

  

  %install

- rm -rf %{buildroot}

- make install prefix="%{buildroot}%{_prefix}" mandir="%{buildroot}%{_mandir}" INSTALL="install -Dp"

- install -d  html

- install -pm 0644 doc/*.html html

- install -d %{buildroot}%{_datadir}/vim/vimfiles/syntax

- install -pm 0644 misc/halibut.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax

+ %cmake_install

+ install -Dpm 0644 misc/halibut.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/halibut.vim

  

  %files

- %doc LICENCE html

- %{_bindir}/halibut

+ %doc LICENCE

+ %doc %{_docdir}/%{name}/*.html

+ %{_bindir}/%{name}

+ %{_infodir}/*

  %{_mandir}/man1/*.1*

  

  %files -n vim-halibut
@@ -53,6 +49,10 @@ 

  %{_datadir}/vim/vimfiles/syntax/*.vim

  

  %changelog

+ * Mon Nov  1 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1.3-1

+ - New version

+   Resolves: rhbz#2018669

+ 

  * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (halibut-1.2.tar.gz) = b04cc5c52f2d7cd2bb9a36a1aa896c6a4fd11bcfc5fad3d9c74576bf2576ce237cd7ac3ceeff3bd10dfd5a229614d06d23323509d3a83ff74b4a1965e1d726fc

+ SHA512 (halibut-1.3.tar.gz) = 872f0cdb398002843d7e1b19f6eaf80ff848ce5ffee8653fa88da63c57e89efcbfaadc09b476280d25d38136f7d8af286fa98b9b36598515e0eb50f1945ee34a

Resolves: rhbz#2018669

Pull-Request has been merged by jskarvad

2 years ago