rpms/highlight/devel highlight.spec,1.41,1.42

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22284

Modified Files:
	highlight.spec 
Log Message:
Adding GUI subpackage


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- highlight.spec	20 Apr 2009 17:05:31 -0000	1.41
+++ highlight.spec	20 Apr 2009 19:46:40 -0000	1.42
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.8
-Release:	1%{?dist}
+Release:	3%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -10,7 +10,8 @@
 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,6 +23,13 @@
 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
@@ -42,15 +50,25 @@
 %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
+
+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 @@
 
 %files
 %defattr(-,root,root,-)
-
 %{_bindir}/highlight
 %{_datadir}/highlight/
 %{_mandir}/man1/highlight.1*
@@ -69,7 +86,16 @@
 
 %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 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