Compare commits

..

40 commits

Author SHA1 Message Date
Miro Hrončok
b66f501cba Orphaned for 6+ weeks 2019-10-17 13:21:48 +02:00
Fedora Release Engineering
674e640426 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 04:43:19 +00:00
Fedora Release Engineering
1aba613db5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 12:53:53 +00:00
d1d68ef43e Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:56 +01:00
Russell Cattelan
4ad90c3d2f Change to use python2 for setup.py install 2018-08-01 06:01:19 +00:00
Russell Cattelan
d632f2c7a6 Add patch to switch setup.py to python2 2018-08-01 05:34:30 +00:00
d93deab7f8
Switch to %py2_build
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-07-29 23:25:24 +02:00
574b82f45f
%{python_sitelib} → %{python2_sitelib}
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-07-29 23:11:35 +02:00
Fedora Release Engineering
37ef1d0ff6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 09:38:38 +00:00
Jason Tibbitts
156607d29d Remove needless use of %defattr 2018-07-09 23:56:24 -05:00
7f0d895d89
Remove %clean section
None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-14 09:14:36 +01:00
118c761640 Remove BuildRoot definition
None of currently supported distributions need that.
It was needed last for EL5 which is EOL now

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-14 00:52:02 +01:00
Fedora Release Engineering
2c2b91d569 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 22:11:16 +00:00
Iryna Shcherbina
122f43b13a Update Python 2 dependency declarations to new packaging standards 2018-02-05 05:40:07 +01:00
Fedora Release Engineering
32c701beed - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 11:02:40 +00:00
Fedora Release Engineering
f30e86b0c7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 22:30:40 +00:00
Fedora Release Engineering
d26d842c85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 18:12:40 +00:00
Russell Cattelan
30e6a79bc4 Move to Version-1 2016-10-12 11:15:20 -05:00
Russell Cattelan
53f557a2c7 Update to the 4.0.1 release. 2016-10-12 11:04:59 -05:00
Fedora Release Engineering
b3505ea915 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages 2016-07-19 13:12:52 +00:00
Russell Cattelan
07de37b0cf Add .rpmlint file 2016-02-08 04:49:57 -06:00
Fedora Release Engineering
ec9a562907 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 03:53:58 +00:00
Russell Cattelan
027f760c9e Update to 4.0b1 hg snapshot 30158cd 2015-12-14 09:32:31 -06:00
Dennis Gilmore
a41ced2030 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-19 04:32:02 +00:00
Kalev Lember
676b725655 Rebuilt for GCC 5 C++11 ABI change 2015-05-02 18:48:30 +02:00
d172736265 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-18 11:11:39 +00:00
Yaakov Selkowitz
3d3fa90b2b Fix FTBFS with bison-3.x (#1107365) 2014-06-13 13:09:15 -05:00
Dennis Gilmore
e5abad2ec1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-08 02:01:19 -05:00
Dennis Gilmore
1e5e7f53d8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 04:23:57 -05:00
Dennis Gilmore
d1d613bf7f - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 22:07:36 -06:00
Dennis Gilmore
fa08b0d6aa - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-22 02:28:05 -05:00
Paul Howarth
0c01e02ef2 Fix FTBFS with gcc 4.7 2012-04-22 13:44:54 +01:00
Dennis Gilmore
40f2034667 - Rebuilt for c++ ABI breakage 2012-02-28 14:40:51 -06:00
Dennis Gilmore
aca5009387 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-14 03:22:17 -06:00
Dennis Gilmore
269c0835f4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-08 01:12:58 -06:00
Russell Cattelan
61c88a8a92 Change BuildRequires from qt-devel to qt3-devel 2010-11-16 02:55:35 -06:00
Fedora Release Engineering
dee57acb90 dist-git conversion 2010-07-29 16:17:23 +00:00
d990617839 - Rebuilt for
https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
2010-07-22 07:19:26 +00:00
Bill Nottingham
be5c7146c8 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 22:41:08 +00:00
Jesse Keating
7f58170e20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild 2009-07-27 08:49:38 +00:00
5 changed files with 1 additions and 137 deletions

1
.gitignore vendored
View file

@ -1 +0,0 @@
xxdiff-3.2-noscreenshots.tar.bz2

1
dead.package Normal file
View file

@ -0,0 +1 @@
Orphaned for 6+ weeks

View file

@ -1 +0,0 @@
a61422a89f9ad5aab1c69d3995bbaded xxdiff-3.2-noscreenshots.tar.bz2

View file

@ -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
*============================================================================*/

View file

@ -1,122 +0,0 @@
Summary: Graphical file and directories comparator and merge tool
Name: xxdiff
Version: 3.2
Release: 10%{?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
* 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