rpms/highlight
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Updated to new 3.47 upstream version

Browse Source 
- spec cleanup (remove old unused comments)
- Fixes rhbz #1611359 and #1630845 thanks to Milan Crha for all bug reports
This commit is contained in:
Filipe Rosset 2018-10-26 21:08:50 -03:00
parent 0c48abddda
commit c10f0f745f
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -27,3 +27,4 @@ highlight-3.1-beta2.tar.bz2
/highlight-3.39.tar.bz2 /highlight-3.39.tar.bz2
/highlight-3.42.tar.bz2 /highlight-3.42.tar.bz2
/highlight-3.44.tar.bz2 /highlight-3.44.tar.bz2
/highlight-3.47.tar.bz2

26
highlight.spec
View File

@ -1,7 +1,7 @@
Name: highlight Name: highlight
Summary: Universal source code to formatted text converter Summary: Universal source code to formatted text converter
Version: 3.44 Version: 3.47
Release: 2%{?dist} Release: 1%{?dist}
Group: Development/Tools Group: Development/Tools
License: GPLv3 License: GPLv3
@ -39,21 +39,10 @@ A Qt-based GUI for the highlight source code formatter source.
%autosetup %autosetup
%build %build
#CFLAGS="%{optflags}"; export CFLAGS
#CXXFLAGS="%{optflags}"; export CXXFLAGS
#LDFLAGS="%{?__global_ldflags}"; export LDFLAGS
CFLAGS="$CFLAGS -fPIC %{optflags}"; export CFLAGS CFLAGS="$CFLAGS -fPIC %{optflags}"; export CFLAGS
CXXFLAGS="$CXXFLAGS -fPIC %{optflags}"; export CXXFLAGS CXXFLAGS="$CXXFLAGS -fPIC %{optflags}"; export CXXFLAGS
LDFLAGS="$LDFLAGS %{?__global_ldflags}"; export LDFLAGS LDFLAGS="$LDFLAGS %{?__global_ldflags}"; export LDFLAGS
# Disable paralell builds, atempt to fixes FTBFS
#%make_build all gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
#make_build all gui CFLAGS="$RPM_OPT_FLAGS" \
# LDFLAGS="%{?__global_ldflags}" \
# QMAKE="%{_qt5_qmake}" \
# QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
# QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
# QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
%make_build all gui CFLAGS="${CFLAGS}" \ %make_build all gui CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}" \ LDFLAGS="${LDFLAGS}" \
@ -68,7 +57,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
make install-gui DESTDIR=$RPM_BUILD_ROOT make install-gui DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
desktop-file-install \ desktop-file-install \
@ -79,10 +67,10 @@ desktop-file-install \
%{_bindir}/highlight %{_bindir}/highlight
%{_datadir}/highlight/ %{_datadir}/highlight/
%{_mandir}/man1/highlight.1* %{_mandir}/man1/highlight.1*
%{_mandir}/man5/filetypes.conf.5.gz
%config(noreplace) %{_sysconfdir}/highlight/ %config(noreplace) %{_sysconfdir}/highlight/
%doc ChangeLog AUTHORS README* TODO extras/ %doc ChangeLog* AUTHORS README* extras/
%license COPYING %license COPYING
%files gui %files gui
@ -90,7 +78,13 @@ desktop-file-install \
%{_datadir}/applications/highlight.desktop %{_datadir}/applications/highlight.desktop
%{_datadir}/pixmaps/highlight.xpm %{_datadir}/pixmaps/highlight.xpm
%changelog %changelog
* Fri Oct 26 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.47-1
- Updated to new 3.47 upstream version
- spec cleanup (remove old unused comments)
- Fixes rhbz #1611359 and #1630845 thanks to Milan Crha for all bug reports
* Thu Sep 20 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.44-2 * Thu Sep 20 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.44-2
- attempt to fix and respect build flags rhbz #1563149 - attempt to fix and respect build flags rhbz #1563149

2
sources
View File

@ -1 +1 @@
SHA512 (highlight-3.44.tar.bz2) = a0b9a147cadec72b80b97d92e6fac9312f134ef71a4a67121cab3646668424379c14a9189b5bdd0d892790cc99edc955090967caf6816239151d0e8a19bcfbd7 SHA512 (highlight-3.47.tar.bz2) = 286dcc0db33c8b250852f7b607eb313afbd83da7ead6bde8a35ed5b7f59438b0345725a31dd5969347af10aba0c981f6bf2ce5683b801c45ee27b2b3c6ed21ed