rpms/highlight
5
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream release (beta)

Browse Source
This commit is contained in:
Jochen Schmitt 2010-06-10 15:58:29 +00:00
parent 3e7b67eefe
commit e1e7a44e5f
4 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
highlight-2.16.tar.bz2 highlight-3.0-beta.tar.bz2

18
highlight-3.0beta-make.patch Normal file
View File

@ -0,0 +1,18 @@
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 \

24
highlight.spec
View File

@ -1,15 +1,19 @@
Name: highlight Name: highlight
Summary: Universal source code to formatted text converter Summary: Universal source code to formatted text converter
Version: 2.16 Version: 3.0
Release: 1%{?dist} Release: 0.1%{?dist}
Group: Development/Tools Group: Development/Tools
License: GPLv3 License: GPLv3
URL: http://www.andre-simon.de/ 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: qt-devel >= 4.4
BuildRequires: lua-devel, boost-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) 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. A Qt-based GUI for the highlight source code formatter source.
%prep %prep
<<<<<<< highlight.spec
%setup -q -n %{name}-%{version}-beta
%patch1 -p1 -b .org
=======
%setup -q %setup -q
>>>>>>> 1.54
# Provides: exclude perl(highlight_pipe) from example # Provides: exclude perl(highlight_pipe) from example
cat <<__EOF__ > %{name}-perl.prov cat <<__EOF__ > %{name}-perl.prov
#!/bin/sh #!/bin/sh
/usr/lib/rpm/perl.prov \$* | grep -v '^perl(highlight_pipe)$' /usr/lib/rpm/perl.prov \$* | grep -v '^perl(highlight_pipe)$'
__EOF__ __EOF__
%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl.prov %define __perl_provides %{_builddir}/%{name}-%{version}-beta/%{name}-perl.prov
chmod +x %{__perl_provides} chmod +x %{__perl_provides}
# Requires: exclude perl(IPC::Open3) from example # Requires: exclude perl(IPC::Open3) from example
@ -45,7 +54,7 @@ cat <<__EOF__ > %{name}-perl.req
#!/bin/sh #!/bin/sh
/usr/lib/rpm/perl.req \$* | grep -v '^perl(IPC::Open3)$' /usr/lib/rpm/perl.req \$* | grep -v '^perl(IPC::Open3)$'
__EOF__ __EOF__
%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req %define __perl_requires %{_builddir}/%{name}-%{version}-beta/%{name}-perl.req
chmod +x %{__perl_requires} chmod +x %{__perl_requires}
%build %build
@ -96,7 +105,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pixmaps/highlight.xpm %{_datadir}/pixmaps/highlight.xpm
%changelog %changelog
* Mon Apr 5 2010 Jochen Schmitt <s4504kr@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 - New upstream release
* Sun Mar 14 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.15-2 * Sun Mar 14 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.15-2

2
sources
View File

@ -1 +1 @@
08f1429a6db258ab1a7eecbb4e0d44b2 highlight-2.16.tar.bz2 7c4ba2a9ae6ab3cf2adfa0763ee17edb highlight-3.0-beta.tar.bz2