Description: new update release.
This commit is contained in:
Jochen Schmitt
parent
78b66cf423
commit
27cdf35ea4
@ -1 +1 @@
|
|||||||
highlight-2.4-1.tar.bz2
|
highlight-2.4-2.tar.gz
|
||||||
|
|||||||
@ -1,30 +1,22 @@
|
|||||||
--- highlight-2.4-1/makefile.org 2005-07-19 11:27:46.000000000 +0200
|
--- highlight-2.4-2/makefile.mak 2005-09-22 22:51:16.000000000 +0200
|
||||||
+++ highlight-2.4-1/makefile 2005-08-08 20:07:16.000000000 +0200
|
+++ highlight-2.4-2/makefile 2005-10-09 22:05:40.000000000 +0200
|
||||||
@@ -7,7 +7,7 @@
|
@@ -9,8 +9,8 @@
|
||||||
data_dir = ${DESTDIR}/usr/share/highlight/
|
data_dir = ${DESTDIR}/usr/share/highlight/
|
||||||
|
|
||||||
# Location where the highlight binary will be installed:
|
# Location where the highlight binary will be installed:
|
||||||
-bin_dir = ${DESTDIR}/usr/local/bin/
|
-bin_dir = ${DESTDIR}/usr/local/bin/
|
||||||
|
-# bin_dir = ${DESTDIR}/usr/bin/
|
||||||
|
+# bin_dir = ${DESTDIR}/usr/local/bin/
|
||||||
+bin_dir = ${DESTDIR}/usr/bin/
|
+bin_dir = ${DESTDIR}/usr/bin/
|
||||||
|
|
||||||
# Location where the highlight man page will be installed:
|
# Location where the highlight man page will be installed:
|
||||||
man_dir = ${DESTDIR}/usr/share/man/man1/
|
man_dir = ${DESTDIR}/usr/share/man/man1/
|
||||||
@@ -16,8 +16,9 @@
|
@@ -46,13 +46,7 @@
|
||||||
doc_dir = ${DESTDIR}/usr/share/doc/highlight/
|
@echo "Configuration directory: ${conf_dir}"
|
||||||
|
|
||||||
# Location where the highlight examples will be installed:
|
|
||||||
-examples_dir = ${doc_dir}examples/
|
|
||||||
+examples_dir = $(DESTDIR)/${doc_dir}examples/
|
|
||||||
|
|
||||||
+etc_dir = $(DESTDIR)/etc/highlight
|
|
||||||
|
|
||||||
# Commands:
|
|
||||||
INSTALL_DATA=install -m644
|
|
||||||
@@ -40,12 +41,6 @@
|
|
||||||
@echo "Binary directory: ${bin_dir}"
|
|
||||||
@echo
|
@echo
|
||||||
|
|
||||||
- ${MKDIR} ${doc_dir}
|
- ${MKDIR} ${doc_dir}
|
||||||
|
${MKDIR} ${conf_dir}
|
||||||
- ${MKDIR} ${examples_dir} \
|
- ${MKDIR} ${examples_dir} \
|
||||||
- ${examples_dir}cgi \
|
- ${examples_dir}cgi \
|
||||||
- ${examples_dir}cgi/perl \
|
- ${examples_dir}cgi/perl \
|
||||||
@ -33,16 +25,7 @@
|
|||||||
${MKDIR} ${data_dir} \
|
${MKDIR} ${data_dir} \
|
||||||
${data_dir}themes \
|
${data_dir}themes \
|
||||||
${data_dir}langDefs \
|
${data_dir}langDefs \
|
||||||
@@ -53,25 +48,14 @@
|
@@ -67,18 +61,6 @@
|
||||||
${data_dir}helpmsg
|
|
||||||
${MKDIR} ${man_dir}
|
|
||||||
${MKDIR} ${bin_dir}
|
|
||||||
+ $(MKDIR) $(etc_dir)
|
|
||||||
|
|
||||||
${INSTALL_DATA} ./langDefs/*.lang ${data_dir}langDefs/
|
|
||||||
- ${INSTALL_DATA} ./*.conf ${data_dir}
|
|
||||||
+ ${INSTALL_DATA} ./*.conf ${etc_dir}
|
|
||||||
${INSTALL_DATA} ./themes/*.style ${data_dir}themes/
|
|
||||||
${INSTALL_DATA} ./indentSchemes/*.indent ${data_dir}indentSchemes/
|
${INSTALL_DATA} ./indentSchemes/*.indent ${data_dir}indentSchemes/
|
||||||
${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/
|
${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/
|
||||||
${INSTALL_DATA} ./man/highlight.1.gz ${man_dir}
|
${INSTALL_DATA} ./man/highlight.1.gz ${man_dir}
|
||||||
|
|||||||
@ -1,16 +1,15 @@
|
|||||||
Name: highlight
|
Name: highlight
|
||||||
Summary: Universal source code to formatted text converter
|
Summary: Universal source code to formatted text converter
|
||||||
Version: 2.4.1
|
Version: 2.4.2
|
||||||
Release: 6%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
License: GPL
|
License: GPL
|
||||||
|
|
||||||
URL: http://www.andre-simon.de/
|
URL: http://www.andre-simon.de/
|
||||||
Source0: http://www.andre-simon.de/zip/%{name}-2.4-1.tar.bz2
|
Source0: http://www.andre-simon.de/zip/%{name}-2.4-2.tar.gz
|
||||||
Patch1: highlight-2.4-makefile.patch
|
Patch1: highlight-2.4-makefile.patch
|
||||||
Patch2: highlight-2.4-rpmoptflags.patch
|
Patch2: highlight-2.4-rpmoptflags.patch
|
||||||
Patch3: highlight-2.4-etcdir.patch
|
|
||||||
|
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
|
Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
@ -23,10 +22,9 @@ The utility offers indentation and reformatting capabilities.
|
|||||||
It is easily possible to create new language definitions and colour themes.
|
It is easily possible to create new language definitions and colour themes.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-2.4-1
|
%setup -q -n %{name}-2.4-2
|
||||||
%patch1 -p1
|
%patch1 -p1 -b .mak
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} LDFLAGS=
|
make %{?_smp_mflags} LDFLAGS=
|
||||||
@ -36,8 +34,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
|
||||||
rm -rf $RPM_BUILD_ROOT%{_docdir}/highlight
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
@ -53,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%doc ChangeLog AUTHORS README* COPYING TODO examples/
|
%doc ChangeLog AUTHORS README* COPYING TODO examples/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Oct 9 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.2-0
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
* Wed Aug 10 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-6
|
* Wed Aug 10 2005 Jochen Schmitt <Jochen herr-schmitt de> 2.4.1-6
|
||||||
- Rebuilt for FC-4/FC-3
|
- Rebuilt for FC-4/FC-3
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user