From 156607d29d185413d27950f4857421df93181d10 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 9 Jul 2018 23:56:24 -0500 Subject: [PATCH 01/10] Remove needless use of %defattr --- xxdiff.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xxdiff.spec b/xxdiff.spec index fc78333..1b3a9fb 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -49,13 +49,11 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{__python} setup.py install -O1 --skip-build --root=%{buildroot} --install-lib=%{python_sitelib} %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 From 37ef1d0ff6139977d6ca8682da1a4321e182dd4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:38:38 +0000 Subject: [PATCH 02/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index 1b3a9fb..4746164 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,7 +1,7 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff Version: 4.0.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -75,6 +75,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-review %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 4.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 4.0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 574b82f45faefb5f2f42944f9bc7b3c193f37c8d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 29 Jul 2018 23:11:35 +0200 Subject: [PATCH 03/10] =?UTF-8?q?%{python=5Fsitelib}=20=E2=86=92=20%{pytho?= =?UTF-8?q?n2=5Fsitelib}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Igor Gnatenko --- xxdiff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index 4746164..5a583e7 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -55,7 +55,7 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %files tools %doc doc index.html -%{python_sitelib}/* +%{python2_sitelib}/* %{_bindir}/svn-foreign %{_bindir}/xx-cond-replace %{_bindir}/xx-cvs-diff From d93deab7f85c1dac10a144549ffaa7ecb3cec992 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 29 Jul 2018 23:25:24 +0200 Subject: [PATCH 04/10] Switch to %py2_build Signed-off-by: Igor Gnatenko --- xxdiff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index 5a583e7..f863e2f 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -38,7 +38,7 @@ export CXXFLAGS %{__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 +%py2_build find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; From d632f2c7a6cf0273e8bed6c34689b3437e1c4e1c Mon Sep 17 00:00:00 2001 From: Russell Cattelan Date: Wed, 1 Aug 2018 05:31:58 +0000 Subject: [PATCH 05/10] Add patch to switch setup.py to python2 --- change_python2.patch | 9 +++++++++ xxdiff.spec | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 change_python2.patch diff --git a/change_python2.patch b/change_python2.patch new file mode 100644 index 0000000..672bd2e --- /dev/null +++ b/change_python2.patch @@ -0,0 +1,9 @@ +diff -ur xxdiff-4.0.1.orig/setup.py xxdiff-4.0.1/setup.py +--- xxdiff-4.0.1.orig/setup.py 2016-05-15 22:55:57.000000000 +0000 ++++ xxdiff-4.0.1/setup.py 2018-08-01 05:14:56.672800089 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Install script for xxdiff Python code. + # diff --git a/xxdiff.spec b/xxdiff.spec index f863e2f..0f4a217 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,13 +1,14 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff Version: 4.0.1 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ # The orginal tar can be found at https://bitbucket.org/blais/xxdiff/get/default.tar.bz2 # We remove the screenshots directory since the images in there can not be redistributed without permission. Source0: xxdiff-%{version}.tar.bz2 +Patch0: change_python2.patch BuildRequires: qt-devel, bison, flex @@ -27,6 +28,7 @@ Tools for xxdiff %prep %setup -q +%patch0 -p1 %build CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS}" From 4ad90c3d2fc2b8633518ab08a0cb519b1e76c77f Mon Sep 17 00:00:00 2001 From: Russell Cattelan Date: Wed, 1 Aug 2018 06:01:19 +0000 Subject: [PATCH 06/10] Change to use python2 for setup.py install --- xxdiff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index 0f4a217..d15659a 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -48,7 +48,7 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{__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} +%{__python2} setup.py install -O1 --skip-build --root=%{buildroot} --install-lib=%{python2_sitelib} %files %doc doc index.html From d1d68ef43ef04f94f5bd677f4833f2b437a6829a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:32 +0100 Subject: [PATCH 07/10] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xxdiff.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xxdiff.spec b/xxdiff.spec index d15659a..0d269f1 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -3,7 +3,6 @@ Name: xxdiff Version: 4.0.1 Release: 8%{?dist} License: GPLv2+ -Group: Development/Tools URL: http://furius.ca/xxdiff/ # The orginal tar can be found at https://bitbucket.org/blais/xxdiff/get/default.tar.bz2 # We remove the screenshots directory since the images in there can not be redistributed without permission. @@ -18,7 +17,6 @@ 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: python2-devel From 1aba613db50a567c2eaead74ffa6247ee18522a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:53:53 +0000 Subject: [PATCH 08/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index 0d269f1..ca64503 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,7 +1,7 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff Version: 4.0.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ URL: http://furius.ca/xxdiff/ # The orginal tar can be found at https://bitbucket.org/blais/xxdiff/get/default.tar.bz2 @@ -75,6 +75,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-review %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 4.0.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 4.0.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 674e640426fac67db605ef01565d6c5ce2b7f910 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:43:19 +0000 Subject: [PATCH 09/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index ca64503..fa9b0bb 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,7 +1,7 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff Version: 4.0.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ URL: http://furius.ca/xxdiff/ # The orginal tar can be found at https://bitbucket.org/blais/xxdiff/get/default.tar.bz2 @@ -75,6 +75,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-review %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 4.0.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 4.0.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b66f501cba4471841fec4c64519b21360058c70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 17 Oct 2019 13:21:48 +0200 Subject: [PATCH 10/10] Orphaned for 6+ weeks --- .gitignore | 3 - .rpmlint | 6 -- change_python2.patch | 9 -- dead.package | 1 + sources | 1 - xxdiff.spec | 190 ------------------------------------------- 6 files changed, 1 insertion(+), 209 deletions(-) delete mode 100644 .gitignore delete mode 100644 .rpmlint delete mode 100644 change_python2.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xxdiff.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1c2448e..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -xxdiff-3.2-noscreenshots.tar.bz2 -/xxdiff-4.0b1.20150712hg30158cd.tar.bz2 -/xxdiff-4.0.1.tar.bz2 diff --git a/.rpmlint b/.rpmlint deleted file mode 100644 index a56946c..0000000 --- a/.rpmlint +++ /dev/null @@ -1,6 +0,0 @@ -addFilter("xxdiff-tools.* no-manual-page-for-binary") -addFilter("xxdiff.* no-manual-page-for-binary") -addFilter("xxdiff-tools.* incorrect-fsf-address") -addFilter("xxdiff-debug.* incorrect-fsf-address") -addFilter("spelling-error.*comparator") -addFilter("xxdiff.* invalid-url") diff --git a/change_python2.patch b/change_python2.patch deleted file mode 100644 index 672bd2e..0000000 --- a/change_python2.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -ur xxdiff-4.0.1.orig/setup.py xxdiff-4.0.1/setup.py ---- xxdiff-4.0.1.orig/setup.py 2016-05-15 22:55:57.000000000 +0000 -+++ xxdiff-4.0.1/setup.py 2018-08-01 05:14:56.672800089 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # Install script for xxdiff Python code. - # diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 326e2dd..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -34253b829e249faf2480a989487e99bc xxdiff-4.0.1.tar.bz2 diff --git a/xxdiff.spec b/xxdiff.spec deleted file mode 100644 index fa9b0bb..0000000 --- a/xxdiff.spec +++ /dev/null @@ -1,190 +0,0 @@ -Summary: Graphical file and directories comparator and merge tool -Name: xxdiff -Version: 4.0.1 -Release: 10%{?dist} -License: GPLv2+ -URL: http://furius.ca/xxdiff/ -# The orginal tar can be found at https://bitbucket.org/blais/xxdiff/get/default.tar.bz2 -# We remove the screenshots directory since the images in there can not be redistributed without permission. -Source0: xxdiff-%{version}.tar.bz2 -Patch0: change_python2.patch -BuildRequires: qt-devel, bison, flex - - -%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 -URL: http://furius.ca/xxdiff/doc/xxdiff-scripts.html -Requires: xxdiff -BuildRequires: python2-devel - -%description tools -Tools for xxdiff - -%prep -%setup -q -%patch0 -p1 - -%build -CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS}" -CXXFLAGS="${CFLAGS:-$RPM_OPT_FLAGS}" -export CFLAGS -export CXXFLAGS - -%{__make} QMAKE=qmake-qt4 -C src -f Makefile.bootstrap -%{__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} -%py2_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} -%{__python2} setup.py install -O1 --skip-build --root=%{buildroot} --install-lib=%{python2_sitelib} - -%files -%doc doc index.html -%doc CHANGES COPYING README TODO VERSION -%{_bindir}/xxdiff - -%files tools -%doc doc index.html -%{python2_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-hg-merge -%{_bindir}/xx-match -%{_bindir}/xx-p4-unmerge -%{_bindir}/xx-pyline -%{_bindir}/xx-rename -%{_bindir}/xx-sql-schemas -%{_bindir}/xx-svn-diff -%{_bindir}/xx-svn-resolve -%{_bindir}/xx-svn-review - -%changelog -* Sat Jul 27 2019 Fedora Release Engineering - 4.0.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 4.0.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 4.0.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 4.0.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Feb 05 2018 Iryna Shcherbina - 4.0.1-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Thu Aug 03 2017 Fedora Release Engineering - 4.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 4.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 4.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jul 19 2016 Fedora Release Engineering - 4.0b1.20150712hg30158cd-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Feb 05 2016 Fedora Release Engineering - 4.0b1.20150712hg30158cd-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Dec 14 2015 Stefan Becker - 4.0b1.20150712hg30158cd-1 -- Update to 4.0b1 hg snapshot 30158cd - -* Fri Jun 19 2015 Fedora Release Engineering - 3.2-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 3.2-24 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Aug 18 2014 Fedora Release Engineering - 3.2-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 13 2014 Yaakov Selkowitz - 3.2-22 -- Fix FTBFS with bison-3.x (#1107365) - -* Sun Jun 08 2014 Fedora Release Engineering - 3.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 3.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 3.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 3.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Apr 22 2012 Paul Howarth - 3.2-17 -- Fix FTBFS with gcc 4.7 - -* Tue Feb 28 2012 Fedora Release Engineering - 3.2-16 -- Rebuilt for c++ ABI breakage - -* Sat Jan 14 2012 Fedora Release Engineering - 3.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 3.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Nov 15 2010 Russell Cattelan - 3.2-13 -- Change BuildRequires from qt-devel to qt3-devel - -* Thu Jul 22 2010 David Malcolm - 3.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Mon Jul 27 2009 Fedora Release Engineering - 3.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 3.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 3.2-9 -- Rebuild for Python 2.6 - -* Mon Jun 9 2008 Russell Cattelan - 3.2-8 -- Create a new tar ball without the restricted copyrighted screen shots - -* Thu May 29 2008 Russell Cattelan - 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 - 3.2-6 -- Add desktop file - -* Tue May 6 2008 Russell Cattelan - 3.2-5 -- Remove python from the main package Requires. -- Make sure the build picks rpm defined CFLAGS - -* Mon Apr 28 2008 Russell Cattelan 3.2-4 -- Split out script into tools package -- Minor changes to build process and python lib handling - -* Sun Mar 30 2008 Russell Cattelan 3.2-3 -- Minor fixups based on review comments - -* Sat Mar 29 2008 Russell Cattelan 3.2-2 -- Added helper utilites - -* Sat Mar 8 2008 Russell Cattelan 3.2-1 -- Initial Revision