From e5abad2ec1d0ebee4f78d53083da7c4e4d708bd2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 02:01:19 -0500 Subject: [PATCH 01/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index b6376e3..180124c 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,7 +1,7 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff Version: 3.2 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -94,6 +94,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-resolve %changelog +* 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 From 3d3fa90b2bad80f07a57819950cc4dc41920ee8c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 13 Jun 2014 13:09:15 -0500 Subject: [PATCH 02/28] Fix FTBFS with bison-3.x (#1107365) --- xxdiff-3.2-bison3.patch | 103 ++++++++++++++++++++++++++++++++++++++++ xxdiff.spec | 9 +++- 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 xxdiff-3.2-bison3.patch diff --git a/xxdiff-3.2-bison3.patch b/xxdiff-3.2-bison3.patch new file mode 100644 index 0000000..e5b95af --- /dev/null +++ b/xxdiff-3.2-bison3.patch @@ -0,0 +1,103 @@ +Backport of proposed patch in upstream bugtracker: + +https://sourceforge.net/p/xxdiff/bugs/229/ + +diff --git a/src/resParser.cpp b/src/resParser.cpp +index e0b6023..63faad9 100644 +--- a/src/resParser.cpp ++++ b/src/resParser.cpp +@@ -73,7 +73,7 @@ extern int resParserparse( void* ); + + //------------------------------------------------------------------------------ + // +-void resParsererror( const char* msg ) ++void resParsererror( void* resources __attribute__((__unused__)), const char* msg ) + { + // Send errors to stdout so we can filter out the debug info shmeglu while + // debugging parser. +@@ -786,7 +786,7 @@ int parseFromKeywordList( + QString os; + QTextOStream oss( &os ); + oss << "Unknown " << errmsg << ": " << name << flush; +- resParsererror( os.latin1() ); ++ resParsererror( NULL, os.latin1() ); + } + num = ERROR_TOKEN; + return ERROR_TOKEN; +diff --git a/src/resParser.l b/src/resParser.l +index 51c7f30..961ad3f 100644 +--- a/src/resParser.l ++++ b/src/resParser.l +@@ -298,7 +298,7 @@ iddot [a-zA-Z][a-zA-Z0-9\.]* + QString os; + QTextOStream oss( &os ); + oss << "ignoring char: " << yytext << flush; +- yyerror( os.latin1() ); ++ yyerror( resources, os.latin1() ); + */ + } + } +diff --git a/src/resParser.y b/src/resParser.y +index 716ed40..bae21cf 100644 +--- a/src/resParser.y ++++ b/src/resParser.y +@@ -39,12 +39,11 @@ + + // The parser input is the resources object to fill in. + #define RESOURCES ( static_cast(resources) ) +-#define YYPARSE_PARAM resources + + // Declare lexer from other compilation unit. + int resParserlex( YYSTYPE* yylval ); + +-void resParsererror( const char* msg ); ++void resParsererror( void *resources, const char* msg ); + + // Declare some parser functions and data defined in resParser.cpp + namespace XxResParserNS { +@@ -58,6 +57,9 @@ using namespace XxResParserNS; // Make sure we can use the above. + + %} + ++/* The parser input is the resources object to fill in. */ ++%parse-param { void *resources } ++ + /* generate header file */ + %defines + +@@ -144,7 +146,7 @@ using namespace XxResParserNS; // Make sure we can use the above. + %type boolkwd + + %start xxdiffrc +-%pure_parser ++%pure-parser + + %% + xxdiffrc : stmts +@@ -188,7 +190,7 @@ prefgeometry : PREFGEOMETRY COLON GEOMSPEC + RESOURCES->setPreferredGeometry( geometry ); + } + else { +- yyerror( "Bad geometry specification." ); ++ yyerror( resources, "Bad geometry specification." ); + // Should never happen, the lexer regexp should be tough + // enough. + } +@@ -216,7 +218,7 @@ style : STYLE COLON STRING + err += QString( "\nValid styles are: " ); + err += styles.join( ", " ); + #endif +- yyerror( err.latin1() ); ++ yyerror( resources, err.latin1() ); + #if (QT_VERSION >= 0x030000) + } + #endif +@@ -230,7 +232,7 @@ accel : ACCEL DOT ACCELNAME COLON STRING + char buf[2048]; + ::snprintf( buf, 2048, + "Unrecognized accelerator: %s\n", $5 ); +- yyerror( buf ); ++ yyerror( resources, buf ); + } + } + ; diff --git a/xxdiff.spec b/xxdiff.spec index 180124c..d7d69ef 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,7 +1,7 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff Version: 3.2 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -14,6 +14,7 @@ BuildRequires: qt3-devel < 1:4.0, bison, flex Patch0: %{name}-fix-cstdlib_h.patch Patch1: xxdiff-3.2-c-linkage.patch Patch2: xxdiff-3.2-string-constants.patch +Patch3: xxdiff-3.2-bison3.patch %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -41,6 +42,9 @@ Tools for xxdiff # Fix the multitude of warnings about string constants converted to 'char*' %patch2 -p1 +# Fix FTBFS with bison-3.x, https://sf.net/p/xxdiff/bugs/229/ +%patch3 -p1 + %build if [ -z "$QTDIR" ]; then . /etc/profile.d/qt.sh @@ -94,6 +98,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-resolve %changelog +* 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 From d172736265369f730a060e7d6b3038aed6b86909 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:11:39 +0000 Subject: [PATCH 03/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index d7d69ef..fd44c7e 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,7 +1,7 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff Version: 3.2 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -98,6 +98,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-resolve %changelog +* 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) From 676b7256552b5ed5439ef655be0d2b5c4e3f5e9a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:48:30 +0200 Subject: [PATCH 04/28] Rebuilt for GCC 5 C++11 ABI change --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index fd44c7e..49607c4 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,7 +1,7 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff Version: 3.2 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -98,6 +98,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-resolve %changelog +* 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 From a41ced2030c46f4fdf2bf4db73d773510b0eb81e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:32:02 +0000 Subject: [PATCH 05/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index 49607c4..aa6f4fc 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,7 +1,7 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff Version: 3.2 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -98,6 +98,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-resolve %changelog +* 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 From 027f760c9ed92d6793dabda5f50d8724c23699d0 Mon Sep 17 00:00:00 2001 From: Russell Cattelan Date: Mon, 14 Dec 2015 09:32:31 -0600 Subject: [PATCH 06/28] Update to 4.0b1 hg snapshot 30158cd --- .gitignore | 1 + sources | 2 +- xxdiff-3.2-bison3.patch | 103 ------------ xxdiff-3.2-c-linkage.patch | 10 -- xxdiff-3.2-string-constants.patch | 258 ------------------------------ xxdiff-fix-cstdlib_h.patch | 13 -- xxdiff.spec | 38 ++--- 7 files changed, 14 insertions(+), 411 deletions(-) delete mode 100644 xxdiff-3.2-bison3.patch delete mode 100644 xxdiff-3.2-c-linkage.patch delete mode 100644 xxdiff-3.2-string-constants.patch delete mode 100644 xxdiff-fix-cstdlib_h.patch diff --git a/.gitignore b/.gitignore index ed89bfe..a1269af 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xxdiff-3.2-noscreenshots.tar.bz2 +/xxdiff-4.0b1.20150712hg30158cd.tar.bz2 diff --git a/sources b/sources index a1f5b51..92d88d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a61422a89f9ad5aab1c69d3995bbaded xxdiff-3.2-noscreenshots.tar.bz2 +f90b09f91e24fe025901795586d46274 xxdiff-4.0b1.20150712hg30158cd.tar.bz2 diff --git a/xxdiff-3.2-bison3.patch b/xxdiff-3.2-bison3.patch deleted file mode 100644 index e5b95af..0000000 --- a/xxdiff-3.2-bison3.patch +++ /dev/null @@ -1,103 +0,0 @@ -Backport of proposed patch in upstream bugtracker: - -https://sourceforge.net/p/xxdiff/bugs/229/ - -diff --git a/src/resParser.cpp b/src/resParser.cpp -index e0b6023..63faad9 100644 ---- a/src/resParser.cpp -+++ b/src/resParser.cpp -@@ -73,7 +73,7 @@ extern int resParserparse( void* ); - - //------------------------------------------------------------------------------ - // --void resParsererror( const char* msg ) -+void resParsererror( void* resources __attribute__((__unused__)), const char* msg ) - { - // Send errors to stdout so we can filter out the debug info shmeglu while - // debugging parser. -@@ -786,7 +786,7 @@ int parseFromKeywordList( - QString os; - QTextOStream oss( &os ); - oss << "Unknown " << errmsg << ": " << name << flush; -- resParsererror( os.latin1() ); -+ resParsererror( NULL, os.latin1() ); - } - num = ERROR_TOKEN; - return ERROR_TOKEN; -diff --git a/src/resParser.l b/src/resParser.l -index 51c7f30..961ad3f 100644 ---- a/src/resParser.l -+++ b/src/resParser.l -@@ -298,7 +298,7 @@ iddot [a-zA-Z][a-zA-Z0-9\.]* - QString os; - QTextOStream oss( &os ); - oss << "ignoring char: " << yytext << flush; -- yyerror( os.latin1() ); -+ yyerror( resources, os.latin1() ); - */ - } - } -diff --git a/src/resParser.y b/src/resParser.y -index 716ed40..bae21cf 100644 ---- a/src/resParser.y -+++ b/src/resParser.y -@@ -39,12 +39,11 @@ - - // The parser input is the resources object to fill in. - #define RESOURCES ( static_cast(resources) ) --#define YYPARSE_PARAM resources - - // Declare lexer from other compilation unit. - int resParserlex( YYSTYPE* yylval ); - --void resParsererror( const char* msg ); -+void resParsererror( void *resources, const char* msg ); - - // Declare some parser functions and data defined in resParser.cpp - namespace XxResParserNS { -@@ -58,6 +57,9 @@ using namespace XxResParserNS; // Make sure we can use the above. - - %} - -+/* The parser input is the resources object to fill in. */ -+%parse-param { void *resources } -+ - /* generate header file */ - %defines - -@@ -144,7 +146,7 @@ using namespace XxResParserNS; // Make sure we can use the above. - %type boolkwd - - %start xxdiffrc --%pure_parser -+%pure-parser - - %% - xxdiffrc : stmts -@@ -188,7 +190,7 @@ prefgeometry : PREFGEOMETRY COLON GEOMSPEC - RESOURCES->setPreferredGeometry( geometry ); - } - else { -- yyerror( "Bad geometry specification." ); -+ yyerror( resources, "Bad geometry specification." ); - // Should never happen, the lexer regexp should be tough - // enough. - } -@@ -216,7 +218,7 @@ style : STYLE COLON STRING - err += QString( "\nValid styles are: " ); - err += styles.join( ", " ); - #endif -- yyerror( err.latin1() ); -+ yyerror( resources, err.latin1() ); - #if (QT_VERSION >= 0x030000) - } - #endif -@@ -230,7 +232,7 @@ accel : ACCEL DOT ACCELNAME COLON STRING - char buf[2048]; - ::snprintf( buf, 2048, - "Unrecognized accelerator: %s\n", $5 ); -- yyerror( buf ); -+ yyerror( resources, buf ); - } - } - ; diff --git a/xxdiff-3.2-c-linkage.patch b/xxdiff-3.2-c-linkage.patch deleted file mode 100644 index 4839a42..0000000 --- a/xxdiff-3.2-c-linkage.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/main.h -+++ src/main.h -@@ -35,6 +35,6 @@ - * PUBLIC DECLARATIONS - *============================================================================*/ - --extern char** environ; -+extern "C" char** environ; - - #endif diff --git a/xxdiff-3.2-string-constants.patch b/xxdiff-3.2-string-constants.patch deleted file mode 100644 index 7e30504..0000000 --- a/xxdiff-3.2-string-constants.patch +++ /dev/null @@ -1,258 +0,0 @@ ---- xxdiff-3.2/src/pixmaps/xxdiff.xpm 2005-10-31 07:17:33.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/xxdiff.xpm 2009-06-17 11:11:54.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * xxdiff_xpm[] = { -+static const char * xxdiff_xpm[] = { - "190 75 2931 2", - " c None", - ". c #B8CFDD", ---- xxdiff-3.2/src/pixmaps/next_difference.xpm 2005-10-31 07:17:33.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/next_difference.xpm 2009-06-17 11:19:26.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * next_difference_xpm[] = { -+static const char * next_difference_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/next_unselected_difference.xpm 2005-10-31 07:17:33.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/next_unselected_difference.xpm 2009-06-17 11:20:20.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * next_unselected_difference_xpm[] = { -+static const char * next_unselected_difference_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/previous_difference.xpm 2009-06-17 11:21:58.000000000 +0100 -+++ xxdiff-3.2/src/pixmaps/previous_difference.xpm 2009-06-17 11:21:23.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * previous_difference_xpm[] = { -+static const char * previous_difference_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/previous_unselected_difference.xpm 2005-10-31 07:17:33.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/previous_unselected_difference.xpm 2009-06-17 11:22:49.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * previous_unselected_difference_xpm[] = { -+static const char * previous_unselected_difference_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/search.xpm 2005-10-31 07:17:33.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/search.xpm 2009-06-17 11:23:45.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * search_xpm[] = { -+static const char * search_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/search_backward.xpm 2005-10-31 07:17:37.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/search_backward.xpm 2009-06-17 11:25:06.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * search_backward_xpm[] = { -+static const char * search_backward_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/search_forward.xpm 2005-10-31 07:17:37.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/search_forward.xpm 2009-06-17 11:25:57.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * search_forward_xpm[] = { -+static const char * search_forward_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/select_region_left.xpm 2005-10-31 07:17:37.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/select_region_left.xpm 2009-06-17 11:26:53.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * select_region_left_xpm[] = { -+static const char * select_region_left_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/select_region_middle.xpm 2005-10-31 07:17:37.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/select_region_middle.xpm 2009-06-17 11:28:24.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * select_region_middle_xpm[] = { -+static const char * select_region_middle_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/select_region_neither.xpm 2005-10-31 07:17:37.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/select_region_neither.xpm 2009-06-17 11:29:34.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * select_region_neither_xpm[] = { -+static const char * select_region_neither_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/select_region_right.xpm 2005-10-31 07:17:37.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/select_region_right.xpm 2009-06-17 11:27:40.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * select_region_right_xpm[] = { -+static const char * select_region_right_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/select_region_unselect.xpm 2005-10-31 07:17:37.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/select_region_unselect.xpm 2009-06-17 11:30:32.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * select_region_unselect_xpm[] = { -+static const char * select_region_unselect_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/split_swap_join.xpm 2005-10-31 07:17:37.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/split_swap_join.xpm 2009-06-17 11:31:36.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * split_swap_join_xpm[] = { -+static const char * split_swap_join_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/diff_files.xpm 2005-10-31 07:18:48.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/diff_files.xpm 2009-06-17 11:32:31.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * diff_files_xpm[] = { -+static const char * diff_files_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/diff_files_next.xpm 2005-10-31 07:18:48.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/diff_files_next.xpm 2009-06-17 11:33:30.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * diff_files_next_xpm[] = { -+static const char * diff_files_next_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/save_as_left.xpm 2005-10-31 07:18:01.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/save_as_left.xpm 2009-06-17 11:34:17.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * save_as_left_xpm[] = { -+static const char * save_as_left_xpm[] = { - "32 32 52 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/save_as_middle.xpm 2005-10-31 07:18:01.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/save_as_middle.xpm 2009-06-17 11:35:06.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * save_as_middle_xpm[] = { -+static const char * save_as_middle_xpm[] = { - "32 32 52 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/save_as_right.xpm 2005-10-31 07:18:01.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/save_as_right.xpm 2009-06-17 11:35:48.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * save_as_right_xpm[] = { -+static const char * save_as_right_xpm[] = { - "32 32 52 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/save_as_merged.xpm 2005-10-31 07:18:01.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/save_as_merged.xpm 2009-06-17 11:37:14.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * save_as_merged_xpm[] = { -+static const char * save_as_merged_xpm[] = { - "32 32 52 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/save_as.xpm 2005-10-31 07:18:01.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/save_as.xpm 2009-06-17 11:38:08.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * save_as_xpm[] = { -+static const char * save_as_xpm[] = { - "32 32 52 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/return_accept.xpm 2005-10-31 07:18:48.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/return_accept.xpm 2009-06-17 11:39:08.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * return_accept_xpm[] = { -+static const char * return_accept_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/return_reject.xpm 2005-10-31 07:18:48.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/return_reject.xpm 2009-06-17 11:39:53.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * return_reject_xpm[] = { -+static const char * return_reject_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/pixmaps/return_merged.xpm 2005-10-31 07:18:48.000000000 +0000 -+++ xxdiff-3.2/src/pixmaps/return_merged.xpm 2009-06-17 11:40:37.000000000 +0100 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * return_merged_xpm[] = { -+static const char * return_merged_xpm[] = { - "32 32 2 1", - " c None", - ". c #000000", ---- xxdiff-3.2/src/resParser.cpp 2006-06-11 22:12:33.000000000 +0100 -+++ xxdiff-3.2/src/resParser.cpp 2009-06-17 11:51:51.000000000 +0100 -@@ -1074,7 +1074,7 @@ - XxCommandSwitch bo = XxCommandSwitch(commandSwitchList[ii]._token); - int b1 = res1.getInitSwitch( bo ); - XX_CHECK( -1 <= b1 && b1 <= 1 ); -- char* bmap[3] = { "Nop", "False", "True" }; -+ const char* bmap[3] = { "Nop", "False", "True" }; - if ( b1 != res2.getInitSwitch( bo ) ) { - os << initSwitchStr << "." << commandSwitchList[ii]._name << ": " - << bmap[b1+1] << endl; -@@ -1250,7 +1250,7 @@ - XxCommandSwitch bo = XxCommandSwitch(commandSwitchList[ii]._token); - int b1 = res.getInitSwitch( bo ); - XX_CHECK( -1 <= b1 && b1 <= 1 ); -- char* bmap[3] = { "Nop", "False", "True" }; -+ const char* bmap[3] = { "Nop", "False", "True" }; - os << initSwitchStr << "." << commandSwitchList[ii]._name << ": " - << bmap[b1+1] << endl; - } -@@ -1558,7 +1558,7 @@ - XxCommandSwitch bo = XxCommandSwitch(commandSwitchList[ii]._token); - int b1 = res.getInitSwitch( bo ); - XX_CHECK( -1 <= b1 && b1 <= 1 ); -- char* bmap[3] = { "Nop", "False", "True" }; -+ const char* bmap[3] = { "Nop", "False", "True" }; - os << tok->_name << "." << commandSwitchList[ii]._name << ": " - << bmap[b1+1] << "" << endl; - } ---- xxdiff-3.2/src/util.cpp 2006-06-11 22:12:33.000000000 +0100 -+++ xxdiff-3.2/src/util.cpp 2009-06-17 12:15:48.000000000 +0100 -@@ -789,8 +789,8 @@ - } - if ( pid == 0 ) { - char* argv[4]; -- argv[0] = "sh"; -- argv[1] = "-c"; -+ argv[0] = strdup("sh"); -+ argv[1] = strdup("-c"); - argv[2] = const_cast( command.latin1() ); - argv[3] = 0; - execve( "/bin/sh", argv, environ ); diff --git a/xxdiff-fix-cstdlib_h.patch b/xxdiff-fix-cstdlib_h.patch deleted file mode 100644 index 006640c..0000000 --- a/xxdiff-fix-cstdlib_h.patch +++ /dev/null @@ -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 -+ - /*============================================================================== - * EXTERNAL DECLARATIONS - *============================================================================*/ diff --git a/xxdiff.spec b/xxdiff.spec index aa6f4fc..f36e965 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,22 +1,16 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff -Version: 3.2 -Release: 25%{?dist} +Version: 4.0b1.20150712hg30158cd +Release: 1%{?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 +# 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}-noscreenshots.tar.bz2 +Source0: xxdiff-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt3-devel < 1:4.0, bison, flex +BuildRequires: qt-devel, bison, flex -Patch0: %{name}-fix-cstdlib_h.patch -Patch1: xxdiff-3.2-c-linkage.patch -Patch2: xxdiff-3.2-string-constants.patch -Patch3: xxdiff-3.2-bison3.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 @@ -34,28 +28,14 @@ Tools for xxdiff %prep %setup -q -%patch0 -p2 - -# Fix FTBFS with gcc 4.7 -%patch1 - -# Fix the multitude of warnings about string constants converted to 'char*' -%patch2 -p1 - -# Fix FTBFS with bison-3.x, https://sf.net/p/xxdiff/bugs/229/ -%patch3 -p1 %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 +%{__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} @@ -90,14 +70,20 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_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 +* 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 From ec9a562907466287aa0a41da24b34c368b84ab89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:53:58 +0000 Subject: [PATCH 07/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index f36e965..cbe8216 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,7 +1,7 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff Version: 4.0b1.20150712hg30158cd -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -81,6 +81,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-review %changelog +* 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 From 07de37b0cf842dcc1fc72adf5bd708a2941e4744 Mon Sep 17 00:00:00 2001 From: Russell Cattelan Date: Mon, 8 Feb 2016 04:49:57 -0600 Subject: [PATCH 08/28] Add .rpmlint file --- .rpmlint | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .rpmlint diff --git a/.rpmlint b/.rpmlint new file mode 100644 index 0000000..a56946c --- /dev/null +++ b/.rpmlint @@ -0,0 +1,6 @@ +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") From b3505ea915195d4d482a39d20a806673f1582917 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 13:12:52 +0000 Subject: [PATCH 09/28] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index cbe8216..c20d605 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,7 +1,7 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff Version: 4.0b1.20150712hg30158cd -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -81,6 +81,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-review %changelog +* 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 From 53f557a2c719d1840fc490276e496a121c6d7065 Mon Sep 17 00:00:00 2001 From: Russell Cattelan Date: Wed, 12 Oct 2016 11:04:59 -0500 Subject: [PATCH 10/28] Update to the 4.0.1 release. --- .gitignore | 1 + sources | 2 +- xxdiff.spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a1269af..1c2448e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xxdiff-3.2-noscreenshots.tar.bz2 /xxdiff-4.0b1.20150712hg30158cd.tar.bz2 +/xxdiff-4.0.1.tar.bz2 diff --git a/sources b/sources index 92d88d6..326e2dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f90b09f91e24fe025901795586d46274 xxdiff-4.0b1.20150712hg30158cd.tar.bz2 +34253b829e249faf2480a989487e99bc xxdiff-4.0.1.tar.bz2 diff --git a/xxdiff.spec b/xxdiff.spec index c20d605..59d7c62 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -1,7 +1,7 @@ Summary: Graphical file and directories comparator and merge tool Name: xxdiff -Version: 4.0b1.20150712hg30158cd -Release: 3%{?dist} +Version: 4.0.1 +Release: 0%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ From 30e6a79bc4588116275ce3903ea3ea2261977e1b Mon Sep 17 00:00:00 2001 From: Russell Cattelan Date: Wed, 12 Oct 2016 11:15:20 -0500 Subject: [PATCH 11/28] Move to Version-1 --- xxdiff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index 59d7c62..eb45fa5 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: 0%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ From d26d842c857d45a5c09d4884307bc2f238a10d1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:12:40 +0000 Subject: [PATCH 12/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index eb45fa5..37b648b 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: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -81,6 +81,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-review %changelog +* 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 From f30e86b0c7a3f9c5fc0454bbd5018aeb78d7a016 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:30:40 +0000 Subject: [PATCH 13/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index 37b648b..158d72d 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: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -81,6 +81,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-review %changelog +* 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 From 32c701beed3fd8cd33eef7f2be6392da876c8486 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:02:40 +0000 Subject: [PATCH 14/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xxdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index 158d72d..8ed4c3c 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: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -81,6 +81,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-review %changelog +* 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 From 122f43b13a7ce86b76854b8cdaa24715c37b4b35 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mon, 5 Feb 2018 05:40:07 +0100 Subject: [PATCH 15/28] Update Python 2 dependency declarations to new packaging standards --- xxdiff.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xxdiff.spec b/xxdiff.spec index 8ed4c3c..ae59e71 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: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -21,7 +21,7 @@ Summary: Tools for xxdiff Group: Development/Tools URL: http://furius.ca/xxdiff/doc/xxdiff-scripts.html Requires: xxdiff -BuildRequires: python-devel +BuildRequires: python2-devel %description tools Tools for xxdiff @@ -81,6 +81,10 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-review %changelog +* 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 From 2c2b91d569d85bfe2d687e40d1cf77173f85b88a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:11:16 +0000 Subject: [PATCH 16/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 ae59e71..ac907b5 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: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Development/Tools URL: http://furius.ca/xxdiff/ @@ -81,6 +81,9 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{_bindir}/xx-svn-review %changelog +* 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) From 118c7616408e7cb68175cef6168341ed3ec5e648 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:52:02 +0100 Subject: [PATCH 17/28] 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 --- xxdiff.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xxdiff.spec b/xxdiff.spec index ac907b5..b057da4 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -8,7 +8,6 @@ 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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel, bison, flex From 7f0d895d89194464e0e225f252148e81ca499bb8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:14:36 +0100 Subject: [PATCH 18/28] 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 --- xxdiff.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xxdiff.spec b/xxdiff.spec index b057da4..fc78333 100644 --- a/xxdiff.spec +++ b/xxdiff.spec @@ -48,9 +48,6 @@ find ./build -name \*.py -print -exec %{__sed} -i "1{/^#\!/d}" {} \; %{__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 From 156607d29d185413d27950f4857421df93181d10 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 9 Jul 2018 23:56:24 -0500 Subject: [PATCH 19/28] 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 20/28] - 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 21/28] =?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 22/28] 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 23/28] 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 24/28] 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 25/28] 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 26/28] - 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 27/28] - 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 28/28] 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