- New upstream release

.gitignore

@@ -1,2 +1,3 @@
 highlight-3.1-beta2.tar.bz2
 /highlight-3.1-beta3.tar.bz2
+/highlight-3.1.tar.bz2

highlight.spec

@@ -1,17 +1,14 @@
-%global betaver 3
-%global bdir %{name}-%{version}-beta%{betaver}
-
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 
 Version:	3.1
-Release:	0.3%{?dist}
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPLv3
 
 URL:		http://www.andre-simon.de/
-Source0:	http://www.andre-simon.de/zip/%{name}-%{version}-beta%{betaver}.tar.bz2
+Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
 
 BuildRequires:	qt-devel >= 4.4
 BuildRequires:  lua-devel, boost-devel
@@ -36,14 +33,14 @@ A Qt-based GUI for the highlight source code formatter source.
 
 %prep
 
-%setup -q -n %{bdir}
+%setup -q
 
 # 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}/%{bdir}/%{name}-perl.prov
+%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl.prov
 chmod +x %{__perl_provides}
 
 # Requires: exclude all perl related req. from example
@@ -51,7 +48,7 @@ cat <<__EOF__ > %{name}-perl.req
 #!/bin/sh
 /usr/lib/rpm/perl.req \$* | grep -v '^perl('
 __EOF__
-%define __perl_requires %{_builddir}/%{bdir}/%{name}-perl.req
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req
 chmod +x %{__perl_requires}
 
 %build
@@ -102,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Mon Aug 30 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.1-1
+- New upstream release
+
 * Sun Aug 15 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.1-0.3
 - New upstream release
 

sources

@@ -1 +1 @@
-bf33a7fa1422cc98365d0cedc14d67f0  highlight-3.1-beta3.tar.bz2
+f1974f1cf719e31e8b8bd7c8ef641b2f  highlight-3.1.tar.bz2