Compare commits
39 commits
F-12-split
...
rawhide
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b66f501cba | ||
|
|
674e640426 | ||
|
|
1aba613db5 | ||
| d1d68ef43e | |||
|
|
4ad90c3d2f | ||
|
|
d632f2c7a6 | ||
|
d93deab7f8 |
|||
|
574b82f45f |
|||
|
|
37ef1d0ff6 | ||
|
|
156607d29d | ||
|
7f0d895d89 |
|||
| 118c761640 | |||
|
|
2c2b91d569 | ||
|
|
122f43b13a | ||
|
|
32c701beed | ||
|
|
f30e86b0c7 | ||
|
|
d26d842c85 | ||
|
|
30e6a79bc4 | ||
|
|
53f557a2c7 | ||
|
|
b3505ea915 | ||
|
|
07de37b0cf | ||
|
|
ec9a562907 | ||
|
|
027f760c9e | ||
|
|
a41ced2030 | ||
|
|
676b725655 | ||
| d172736265 | |||
|
|
3d3fa90b2b | ||
|
|
e5abad2ec1 | ||
|
|
1e5e7f53d8 | ||
|
|
d1d613bf7f | ||
|
|
fa08b0d6aa | ||
|
|
0c01e02ef2 | ||
|
|
40f2034667 | ||
|
|
aca5009387 | ||
|
|
269c0835f4 | ||
|
|
61c88a8a92 | ||
|
|
dee57acb90 | ||
| d990617839 | |||
|
|
be5c7146c8 |
7 changed files with 1 additions and 162 deletions
|
|
@ -1 +0,0 @@
|
||||||
xxdiff-3.2-noscreenshots.tar.bz2
|
|
||||||
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
||||||
# Makefile for source rpm: xxdiff
|
|
||||||
# $Id$
|
|
||||||
NAME := xxdiff
|
|
||||||
SPECFILE = $(firstword $(wildcard *.spec))
|
|
||||||
|
|
||||||
define find-makefile-common
|
|
||||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
|
||||||
|
|
||||||
ifeq ($(MAKEFILE_COMMON),)
|
|
||||||
# attept a checkout
|
|
||||||
define checkout-makefile-common
|
|
||||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(MAKEFILE_COMMON)
|
|
||||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Orphaned for 6+ weeks
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
xxdiff-3_2-8_fc9:HEAD:xxdiff-3.2-8.fc9.src.rpm:1213984056
|
|
||||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
||||||
a61422a89f9ad5aab1c69d3995bbaded xxdiff-3.2-noscreenshots.tar.bz2
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
Index: xxdiff/xxdiff-3.2/src/resources.inline.h
|
|
||||||
===================================================================
|
|
||||||
--- xxdiff.orig/xxdiff-3.2/src/resources.inline.h 2005-10-31 01:18:48.000000000 -0600
|
|
||||||
+++ xxdiff/xxdiff-3.2/src/resources.inline.h 2008-03-08 22:31:12.000000000 -0600
|
|
||||||
@@ -20,6 +20,8 @@
|
|
||||||
*
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
+#include <cstdlib>
|
|
||||||
+
|
|
||||||
/*==============================================================================
|
|
||||||
* EXTERNAL DECLARATIONS
|
|
||||||
*============================================================================*/
|
|
||||||
125
xxdiff.spec
125
xxdiff.spec
|
|
@ -1,125 +0,0 @@
|
||||||
Summary: Graphical file and directories comparator and merge tool
|
|
||||||
Name: xxdiff
|
|
||||||
Version: 3.2
|
|
||||||
Release: 11%{?dist}
|
|
||||||
License: GPLv2+
|
|
||||||
Group: Development/Tools
|
|
||||||
URL: http://furius.ca/xxdiff/
|
|
||||||
# The orginal tar can be found at http://furius.ca/downloads/xxdiff/releases/xxdiff-%{version}.tar.bz2
|
|
||||||
# We remove the screenshots directory since the images in there can not be redistributed without permission.
|
|
||||||
Source0: xxdiff-%{version}-noscreenshots.tar.bz2
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
BuildRequires: qt-devel < 1:4.0, bison, flex
|
|
||||||
|
|
||||||
Patch0: %{name}-fix-cstdlib_h.patch
|
|
||||||
|
|
||||||
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
|
||||||
|
|
||||||
%description
|
|
||||||
xxdiff is a graphical browser for viewing the differences between two or three
|
|
||||||
files, or between two directories, and can be used to produce a merged version.
|
|
||||||
|
|
||||||
%package tools
|
|
||||||
Summary: Tools for xxdiff
|
|
||||||
Group: Development/Tools
|
|
||||||
URL: http://furius.ca/xxdiff/doc/xxdiff-scripts.html
|
|
||||||
Requires: xxdiff
|
|
||||||
BuildRequires: python-devel
|
|
||||||
|
|
||||||
%description tools
|
|
||||||
Tools for xxdiff
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -q
|
|
||||||
%patch0 -p2
|
|
||||||
|
|
||||||
%build
|
|
||||||
if [ -z "$QTDIR" ]; then
|
|
||||||
. /etc/profile.d/qt.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS}"
|
|
||||||
CXXFLAGS="${CFLAGS:-$RPM_OPT_FLAGS}"
|
|
||||||
export CFLAGS
|
|
||||||
export CXXFLAGS
|
|
||||||
|
|
||||||
%{__make} -C src -f Makefile.bootstrap makefile
|
|
||||||
%{__sed} -i -e "s/^CFLAGS\s*=/CFLAGS +=/g" src/Makefile
|
|
||||||
%{__sed} -i -e "s/^CXXFLAGS\s*=/CXXFLAGS +=/g" src/Makefile
|
|
||||||
%{__make} -C src %{?_smp_mflags}
|
|
||||||
%{__python} setup.py build
|
|
||||||
|
|
||||||
find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \;
|
|
||||||
|
|
||||||
%install
|
|
||||||
%{__rm} -rf %{buildroot}
|
|
||||||
%{__mkdir_p} %{buildroot}%{_bindir}
|
|
||||||
%{__install} -m 755 bin/xxdiff %{buildroot}%{_bindir}
|
|
||||||
%{__python} setup.py install -O1 --skip-build --root=%{buildroot} --install-lib=%{python_sitelib}
|
|
||||||
|
|
||||||
%clean
|
|
||||||
%{__rm} -rf %{buildroot}
|
|
||||||
|
|
||||||
%files
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc doc index.html
|
|
||||||
%doc CHANGES COPYING README TODO VERSION
|
|
||||||
%{_bindir}/xxdiff
|
|
||||||
|
|
||||||
%files tools
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc doc index.html
|
|
||||||
%{python_sitelib}/*
|
|
||||||
%{_bindir}/svn-foreign
|
|
||||||
%{_bindir}/xx-cond-replace
|
|
||||||
%{_bindir}/xx-cvs-diff
|
|
||||||
%{_bindir}/xx-cvs-revcmp
|
|
||||||
%{_bindir}/xx-diff-proxy
|
|
||||||
%{_bindir}/xx-encrypted
|
|
||||||
%{_bindir}/xx-filter
|
|
||||||
%{_bindir}/xx-find-grep-sed
|
|
||||||
%{_bindir}/xx-match
|
|
||||||
%{_bindir}/xx-pyline
|
|
||||||
%{_bindir}/xx-rename
|
|
||||||
%{_bindir}/xx-sql-schemas
|
|
||||||
%{_bindir}/xx-svn-diff
|
|
||||||
%{_bindir}/xx-svn-resolve
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-11
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-10
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 3.2-9
|
|
||||||
- Rebuild for Python 2.6
|
|
||||||
|
|
||||||
* Mon Jun 9 2008 Russell Cattelan <cattelan@thebarn.com> - 3.2-8
|
|
||||||
- Create a new tar ball without the restricted copyrighted screen shots
|
|
||||||
|
|
||||||
* Thu May 29 2008 Russell Cattelan <cattelan@thebarn.com> - 3.2-7
|
|
||||||
- Remove desktop file, since xxdiff need files at least 2 files specified on
|
|
||||||
- the cmd line.
|
|
||||||
- It is confusing to have a menu option that does not work without
|
|
||||||
- dragging and dropping at least two files.
|
|
||||||
|
|
||||||
* Tue May 27 2008 Russell Cattelan <cattelan@thebarn.com> - 3.2-6
|
|
||||||
- Add desktop file
|
|
||||||
|
|
||||||
* Tue May 6 2008 Russell Cattelan <cattelan@thebarn.com> - 3.2-5
|
|
||||||
- Remove python from the main package Requires.
|
|
||||||
- Make sure the build picks rpm defined CFLAGS
|
|
||||||
|
|
||||||
* Mon Apr 28 2008 Russell Cattelan <cattelan@thebarn.com> 3.2-4
|
|
||||||
- Split out script into tools package
|
|
||||||
- Minor changes to build process and python lib handling
|
|
||||||
|
|
||||||
* Sun Mar 30 2008 Russell Cattelan <cattelan@thebarn.com> 3.2-3
|
|
||||||
- Minor fixups based on review comments
|
|
||||||
|
|
||||||
* Sat Mar 29 2008 Russell Cattelan <cattelan@thebarn.com> 3.2-2
|
|
||||||
- Added helper utilites
|
|
||||||
|
|
||||||
* Sat Mar 8 2008 Russell Cattelan <cattelan@thebarn.com> 3.2-1
|
|
||||||
- Initial Revision
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue