From b122aafbbb55251966b982ddb2674e5a90bd8d3d Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Jun 30 2009 17:42:41 +0000 Subject: New upstream release. License changed to GPLv3 --- diff --git a/highlight-2.6.11-makefile.patch b/highlight-2.6.11-makefile.patch deleted file mode 100644 index 3641aeb..0000000 --- a/highlight-2.6.11-makefile.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -up highlight-2.6.9/makefile.mak highlight-2.6.9/makefile ---- highlight-2.6.9/makefile.mak 2008-03-26 22:17:36.000000000 +0100 -+++ highlight-2.6.9/makefile 2008-03-31 20:40:34.000000000 +0200 -@@ -51,21 +51,12 @@ all-gui-wx29: - install: - @echo "This script will install highlight in the following directories:" - @echo "Data directory: ${DESTDIR}${data_dir}" -- @echo "Documentation directory: ${DESTDIR}${doc_dir}" -- @echo "Examples directory: ${DESTDIR}${examples_dir}" - @echo "Manual directory: ${DESTDIR}${man_dir}" - @echo "Binary directory: ${DESTDIR}${bin_dir}" - @echo "Configuration directory: ${DESTDIR}${conf_dir}" - @echo - -- ${MKDIR} ${DESTDIR}${doc_dir} - ${MKDIR} ${DESTDIR}${conf_dir} -- ${MKDIR} ${DESTDIR}${examples_dir} \ -- ${DESTDIR}${examples_dir}plugins \ -- ${DESTDIR}${examples_dir}plugins/dokuwiki \ -- ${DESTDIR}${examples_dir}plugins/movabletype \ -- ${DESTDIR}${examples_dir}plugins/wordpress \ -- ${DESTDIR}${examples_dir}swig - ${MKDIR} ${DESTDIR}${data_dir} \ - ${DESTDIR}${data_dir}themes \ - ${DESTDIR}${data_dir}langDefs \ -@@ -80,22 +71,6 @@ install: - ${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/ - ${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/ - ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir} -- ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} -- ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir} -- ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir} -- ${INSTALL_DATA} ./README_INDENT ${DESTDIR}${doc_dir} -- ${INSTALL_DATA} ./README_REGEX ${DESTDIR}${doc_dir} -- ${INSTALL_DATA} ./README_LANGLIST ${DESTDIR}${doc_dir} -- ${INSTALL_DATA} ./ChangeLog ${DESTDIR}${doc_dir} -- ${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir} -- ${INSTALL_DATA} ./INSTALL ${DESTDIR}${doc_dir} -- ${INSTALL_DATA} ./examples/plugins/dokuwiki/* ${DESTDIR}${examples_dir}plugins/dokuwiki/ -- ${INSTALL_DATA} ./examples/plugins/movabletype/* ${DESTDIR}${examples_dir}plugins/movabletype/ -- ${INSTALL_DATA} ./examples/plugins/wordpress/* ${DESTDIR}${examples_dir}plugins/wordpress/ -- ${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${DESTDIR}${examples_dir}swig -- ${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${DESTDIR}${examples_dir}swig -- ${INSTALL_DATA} ./examples/swig/README_SWIG ${DESTDIR}${doc_dir} -- ${INSTALL_DATA} ./examples/highlight_pipe.* ${DESTDIR}${examples_dir} - ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} - - @echo -@@ -121,7 +96,6 @@ install-gui: - uninstall: - @echo "Removing highlight files from system..." - ${RMDIR} ${DESTDIR}${data_dir} -- ${RMDIR} ${DESTDIR}${doc_dir} - ${RMDIR} ${DESTDIR}${conf_dir} - ${RMDIR} ${DESTDIR}${examples_dir} - rm ${DESTDIR}${man_dir}highlight.1.gz diff --git a/highlight.spec b/highlight.spec index f273b61..2e5e2fe 100644 --- a/highlight.spec +++ b/highlight.spec @@ -1,16 +1,16 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.6.14 -Release: 1%{?dist} +Version: 2.10 +Release: 2%{?dist} Group: Development/Tools -License: GPLv2 +License: GPLv3 URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz -Patch1: highlight-2.6.11-makefile.patch -BuildRequires: wxGTK-devel +BuildRequires: qt-devel >= 4.4 +BuildRequires: desktop-file-utils Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -22,9 +22,15 @@ Language descriptions are configurable and support regular expressions. The utility offers indentation and reformatting capabilities. It is easily possible to create new language definitions and colour themes. +%package gui +Summary: GUI for the hihghlight source code formatter +Requires: %{name} = %{version}-%{release} + +%description gui +A Qt-based GUI for the highlight source code formatter source. + %prep %setup -q -%patch1 -p1 -b .mak # Provides: exclude perl(highlight_pipe) from example cat <<__EOF__ > %{name}-perl.prov @@ -42,15 +48,27 @@ __EOF__ %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req chmod +x %{__perl_requires} - %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS= +make gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS= %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps + +make install-gui DESTDIR=$RPM_BUILD_ROOT + +rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/ + +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + highlight.desktop + + # Packaging this example causes lots of incorrect perl provides and # requires. Since it isn't going to work out of the box, I'm nuking it. rm -rf examples/plugins/movabletype @@ -60,7 +78,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) - %{_bindir}/highlight %{_datadir}/highlight/ %{_mandir}/man1/highlight.1* @@ -69,7 +86,37 @@ rm -rf $RPM_BUILD_ROOT %doc ChangeLog AUTHORS README* COPYING TODO examples/ +%files gui +%defattr(-,root,root,-) +%{_bindir}/highlight-gui +%{_datadir}/applications/highlight.desktop +%{_datadir}/pixmaps/highlight.xpm + %changelog +* Mon Jun 29 2009 Jochen Schmitt 2.10-2 +- License was changed go GPLv3 from upstream + +* Mon Jun 29 2009 Jochen Schmitt 2.10-1 +- New upstream release + +* Tue May 12 2009 Jochen Schmitt 2.9-1 +- New upstream release + +* Mon Apr 20 2009 Jochen Schmitt 2.8-3 +- Adding GUI subpackage + +* Mon Apr 20 2009 Jochen Schmitt 2.8-1 +- New upstream release + +* Tue Feb 24 2009 Fedora Release Engineering 2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Feb 3 2009 Jochen Schmitt 2.7-2 +- Patches for gcc-4.4 + +* Thu Jan 15 2009 Jochen Schmitt 2.7-1 +- New upstream release + * Mon Nov 3 2008 Jochen Schmitt 2.6.14-1 - New upstream release diff --git a/sources b/sources index 10abce7..9a0b176 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09bb5bb1d9d9dba215a9d56e02213452 highlight-2.6.14.tar.gz +34d2b41df0974f871215ad0343f63efe highlight-2.10.tar.gz