rpms/highlight/devel highlight-3.0beta-make.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 highlight.spec, 1.54, 1.55 sources, 1.32, 1.33

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/pkgs/rpms/highlight/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32626

Modified Files:
	.cvsignore highlight.spec sources 
Added Files:
	highlight-3.0beta-make.patch 
Log Message:
New upstream release (beta)

highlight-3.0beta-make.patch:
 makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE highlight-3.0beta-make.patch ---
diff -up highlight-3.0-beta/makefile.org highlight-3.0-beta/makefile
--- highlight-3.0-beta/makefile.org	2010-06-09 20:06:16.241377932 +0200
+++ highlight-3.0-beta/makefile	2010-06-09 20:07:59.600387611 +0200
@@ -66,10 +66,10 @@ install:
 	${MKDIR} ${DESTDIR}${doc_dir}
 	${MKDIR} ${DESTDIR}${conf_dir}
 	${MKDIR} ${DESTDIR}${examples_dir} \
-		${DESTDIR}${examples_dir}web_plugins \
-		${DESTDIR}${examples_dir}web_plugins/dokuwiki \
-		${DESTDIR}${examples_dir}web_plugins/movabletype \
-		${DESTDIR}${examples_dir}web_plugins/wordpress \
+		${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 \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	5 Apr 2010 14:45:05 -0000	1.31
+++ .cvsignore	10 Jun 2010 15:58:28 -0000	1.32
@@ -1 +1 @@
-highlight-2.16.tar.bz2
+highlight-3.0-beta.tar.bz2


Index: highlight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- highlight.spec	5 Apr 2010 14:45:06 -0000	1.54
+++ highlight.spec	10 Jun 2010 15:58:29 -0000	1.55
@@ -1,15 +1,19 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.16
-Release:	1%{?dist}
+Version:	3.0
+Release:	0.1%{?dist}
 
 Group:		Development/Tools
 License:	GPLv3
 
 URL:		http://www.andre-simon.de/
-Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
+Source0:	http://www.andre-simon.de/zip/%{name}-%{version}-beta.tar.bz2
+
+# Patch sent to upstream via email
+Patch1:		highlight-3.0beta-make.patch
 
 BuildRequires:	qt-devel >= 4.4
+BuildRequires:  lua-devel, boost-devel
 BuildRequires:	desktop-file-utils
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -30,14 +34,19 @@ Requires:	%{name} = %{version}-%{release
 A Qt-based GUI for the highlight source code formatter source.
 
 %prep
+<<<<<<< highlight.spec
+%setup -q -n %{name}-%{version}-beta
+%patch1 -p1 -b .org
+=======
 %setup -q
+>>>>>>> 1.54
 
 # Provides: exclude perl(highlight_pipe) from example
 cat <<__EOF__ > %{name}-perl.prov
 #!/bin/sh
 /usr/lib/rpm/perl.prov \$* | grep -v '^perl(highlight_pipe)$'
 __EOF__
-%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl.prov
+%define __perl_provides %{_builddir}/%{name}-%{version}-beta/%{name}-perl.prov
 chmod +x %{__perl_provides}
 
 # Requires: exclude perl(IPC::Open3) from example
@@ -45,7 +54,7 @@ cat <<__EOF__ > %{name}-perl.req
 #!/bin/sh
 /usr/lib/rpm/perl.req \$* | grep -v '^perl(IPC::Open3)$'
 __EOF__
-%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req
+%define __perl_requires %{_builddir}/%{name}-%{version}-beta/%{name}-perl.req
 chmod +x %{__perl_requires}
 
 %build
@@ -96,7 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
-* Mon Apr  5 2010 Jochen Schmitt <s4504kr at omega> 2.16-1
+* Thu Jun 10 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.0-0.1
+- New upstream release (beta)
+
+* Mon Apr  5 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.16-1
 - New upstream release
 
 * Sun Mar 14 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.15-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/highlight/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	5 Apr 2010 14:45:06 -0000	1.32
+++ sources	10 Jun 2010 15:58:29 -0000	1.33
@@ -1 +1 @@
-08f1429a6db258ab1a7eecbb4e0d44b2  highlight-2.16.tar.bz2
+7c4ba2a9ae6ab3cf2adfa0763ee17edb  highlight-3.0-beta.tar.bz2