Accepting request 293565 from home:pluskalm:branches:devel:tools

- Update to 1.0.13
  * see attached CHANGES for details
- Cleanup spec-file with spec-cleaner
- Update project url
- Use url for source

OBS-URL: https://build.opensuse.org/request/show/293565
OBS-URL: https://build.opensuse.org/package/show/devel:tools/colordiff?expand=0&rev=9
This commit is contained in:
Martin Pluskal 2015-03-30 12:10:29 +00:00 committed by Git OBS Bridge
parent 47d45fd2bc
commit 28e1cacc33
5 changed files with 31 additions and 20 deletions

3
colordiff-1.0.13.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce2805a130c81545711df94bc00a93545da3f323d835cc38b452d3396ef86c2a
size 19960

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40527ade24255e8f5b3f83415b8ee1404e58483a77e96e8c016ddaadf581e9d9
size 16547

View File

@ -1,6 +1,8 @@
--- Makefile
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -36,9 +36,7 @@
@@ -35,9 +35,7 @@ install:
else \
install -d ${DESTDIR}${ETC_DIR}; \
fi

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Mar 28 13:59:38 UTC 2015 - mpluskal@suse.com
- Update to 1.0.13
* see attached CHANGES for details
- Cleanup spec-file with spec-cleaner
- Update project url
- Use url for source
-------------------------------------------------------------------
Mon Feb 13 10:45:11 UTC 2012 - coolo@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package colordiff
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,15 +17,15 @@
Name: colordiff
Url: http://colordiff.sourceforge.net/
Version: 1.0.9
Version: 1.0.13
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Colour-highlighted 'diff' output
License: GPL-2.0+
Group: Productivity/Text/Utilities
Source0: http://colordiff.sourceforge.net/%{name}-%{version}.tar.bz2
Url: http://www.colordiff.org
Source0: http://www.colordiff.org/%{name}-%{version}.tar.gz
Patch0: colordiff-fix-permission.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@ -40,20 +40,20 @@ customized.
%build
%install
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/etc
make INSTALL_DIR=$RPM_BUILD_ROOT/%{_bindir} \
MAN_DIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \
ETC_DIR=$RPM_BUILD_ROOT/etc install
gzip $RPM_BUILD_ROOT/%{_mandir}/man1/*.1
sed -i -e "s@$RPM_BUILD_ROOT@@" $RPM_BUILD_ROOT/%{_bindir}/colordiff
chmod a-x $RPM_BUILD_ROOT/%{_mandir}/man1/colordiff.*
mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/etc
make INSTALL_DIR=%{buildroot}/%{_bindir} \
MAN_DIR=%{buildroot}/%{_mandir}/man1 \
ETC_DIR=%{buildroot}/etc install
gzip %{buildroot}/%{_mandir}/man1/*.1
sed -i -e "s@%{buildroot}@@" %{buildroot}/%{_bindir}/colordiff
chmod a-x %{buildroot}/%{_mandir}/man1/colordiff.*
%files
%defattr(-,root,root)
%doc README TODO COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg
%doc README COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg
%{_bindir}/*
%{_mandir}/man1/*
%config /etc/colordiffrc
%config %{_sysconfdir}/colordiffrc
%changelog