rpms/highlight/F-10 highlight.spec, 1.37, 1.38 sources, 1.22, 1.23 highlight-2.6.11-makefile.patch, 1.1, NONE

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4666

Modified Files:
	highlight.spec sources 
Removed Files:
	highlight-2.6.11-makefile.patch 
Log Message:
New upstream release. License changed to GPLv3


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-10/highlight.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- highlight.spec	3 Nov 2008 18:55:15 -0000	1.37
+++ highlight.spec	30 Jun 2009 17:42:41 -0000	1.38
@@ -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 a
 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 <Jochen herr-schmitt de> 2.10-2
+- License was changed go GPLv3 from upstream
+
+* Mon Jun 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.10-1
+- New upstream release
+
+* Tue May 12 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.9-1
+- New upstream release
+
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.8-3
+- Adding GUI subpackage
+
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.8-1
+- New upstream release
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 2.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.7-2
+- Patches for gcc-4.4
+
+* Thu Jan 15 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.7-1
+- New upstream release
+
 * Mon Nov  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.14-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	3 Nov 2008 18:55:15 -0000	1.22
+++ sources	30 Jun 2009 17:42:41 -0000	1.23
@@ -1 +1 @@
-09bb5bb1d9d9dba215a9d56e02213452  highlight-2.6.14.tar.gz
+34d2b41df0974f871215ad0343f63efe  highlight-2.10.tar.gz


--- highlight-2.6.11-makefile.patch DELETED ---