Hello community,
here is the log from the commit of package dar
checked in at Tue Nov 6 22:13:06 CET 2007.
--------
--- dar/dar.changes 2007-11-01 13:12:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/dar/dar.changes 2007-11-06 09:43:38.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 6 09:43:24 CET 2007 - adrian@suse.de
+
+- fix building
+- fix rpmlint errors
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dar.spec ++++++
--- /var/tmp/diff_new_pack.d10043/_old 2007-11-06 22:11:44.000000000 +0100
+++ /var/tmp/diff_new_pack.d10043/_new 2007-11-06 22:11:44.000000000 +0100
@@ -16,7 +16,7 @@
Group: System/Filesystems
Summary: Backup and Restore Application
Version: 2.3.6
-Release: 1
+Release: 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-%version.tar.bz2
Patch: %name.diff
@@ -136,6 +136,9 @@
%_libdir/libdar*.so
%_libdir/pkgconfig/libdar*.pc
%changelog
+* Tue Nov 06 2007 - adrian@suse.de
+- fix building
+- fix rpmlint errors
* Thu Nov 01 2007 - coolo@suse.de
- compile with gcc 4.3
* Thu Nov 01 2007 - coolo@suse.de
++++++ dar.diff ++++++
--- /var/tmp/diff_new_pack.d10043/_old 2007-11-06 22:11:45.000000000 +0100
+++ /var/tmp/diff_new_pack.d10043/_new 2007-11-06 22:11:45.000000000 +0100
@@ -1,5 +1,5 @@
--- configure.ac
-+++ configure.ac 2007/07/06 10:44:08
++++ configure.ac 2007/11/06 08:31:14
@@ -8,7 +8,7 @@
AM_INIT_AUTOMAKE
@@ -10,8 +10,8 @@
# Checks for programs.
--- src/dar_suite/command_line.cpp
-+++ src/dar_suite/command_line.cpp 2007/07/06 10:44:08
-@@ -836,7 +836,7 @@
++++ src/dar_suite/command_line.cpp 2007/11/06 08:31:14
+@@ -828,7 +828,7 @@
throw Erange("get_args", tools_printf(gettext(MISSING_ARG), char(lu)));
if(filename != "" || sauv_root != NULL)
throw Erange("get_args", gettext(" Only one option of -c -d -t -l -C -x or -+ is allowed"));
@@ -21,8 +21,17 @@
else
throw Erange("get_args", tools_printf(gettext(INVALID_ARG), char(lu)));
--- src/dar_suite/dar_cp.cpp
-+++ src/dar_suite/dar_cp.cpp 2007/07/06 10:44:08
-@@ -92,7 +92,7 @@
++++ src/dar_suite/dar_cp.cpp 2007/11/06 08:31:15
+@@ -50,6 +50,8 @@
+ #endif
+ }
+
++#include <cstring>
++#include <cstdlib>
+ #include <iostream>
+
+ #include "dar_suite.hpp"
+@@ -92,7 +94,7 @@
ret = EXIT_OK;
}
else
@@ -31,9 +40,27 @@
{
show_usage(dialog, argv[0]);
ret = EXIT_SYNTAX;
+--- src/dar_suite/dar_manager.cpp
++++ src/dar_suite/dar_manager.cpp 2007/11/06 08:31:15
+@@ -29,6 +29,7 @@
+ #include "getopt_decision.h"
+ } // end extern "C"
+
++#include <cstring>
+ #include <vector>
+ #include <string>
+ #include "dar_suite.hpp"
--- src/dar_suite/dar_suite.cpp
-+++ src/dar_suite/dar_suite.cpp 2007/07/06 10:44:08
-@@ -96,7 +96,7 @@
++++ src/dar_suite/dar_suite.cpp 2007/11/06 08:31:15
+@@ -45,6 +45,7 @@
+
+ }
+
++#include <cstring>
+ #include <iostream>
+ #include <new>
+
+@@ -96,7 +97,7 @@
// gettext settings
try
{
@@ -43,8 +70,16 @@
throw Erange("", "Cannot open the translated messages directory, native language support will not work");
if(setlocale(LC_MESSAGES, "") == NULL || setlocale(LC_CTYPE, "") == NULL)
--- src/dar_suite/dar_xform.cpp
-+++ src/dar_suite/dar_xform.cpp 2007/07/06 10:44:08
-@@ -356,7 +356,7 @@
++++ src/dar_suite/dar_xform.cpp 2007/11/06 08:31:15
+@@ -33,6 +33,7 @@
+ #include "getopt_decision.h"
+ } // end extern "C"
+
++#include <cstring>
+ #include <iostream>
+ #include "sar.hpp"
+ #include "sar_tools.hpp"
+@@ -356,7 +357,7 @@
dialog.warning(gettext("Too many argument on command line, see -h option for help"));
return false;
}
@@ -53,7 +88,7 @@
{
tools_split_path_basename(argv[optind], src_dir, src);
tools_check_basename(dialog, *src_dir, src, EXTENSION);
-@@ -366,7 +366,7 @@
+@@ -366,7 +367,7 @@
dialog.warning(gettext("Invalid argument as source archive"));
return false;
}
@@ -62,92 +97,100 @@
tools_split_path_basename(argv[optind+1], dst_dir, dst);
else
{
---- src/testing/test_libdar.cpp
-+++ src/testing/test_libdar.cpp 2007/07/06 10:44:08
-@@ -161,7 +161,7 @@
- bool has_children,
- void *context)
- {
-- ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (U_I)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children");
-+ ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (long)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children");
- }
+--- src/examples/factoriel.cpp
++++ src/examples/factoriel.cpp 2007/11/06 08:31:15
+@@ -48,6 +48,7 @@
+ #endif
+ } // end extern "C"
- void f2()
---- src/libdar/erreurs.cpp 2005-12-29 03:32:41.000000000 +0100
-+++ src/libdar/erreurs.cpp 2007-11-01 12:27:27.000000000 +0100
++#include <cstring>
+ #include <string>
+ #include <iostream>
+
+--- src/examples/prime.cpp
++++ src/examples/prime.cpp 2007/11/06 08:31:15
@@ -25,6 +25,7 @@
- #include "../my_config.h"
+ #include "../my_config.h"
#include <iostream>
+#include <cstdlib>
- #include "erreurs.hpp"
+
#include "infinint.hpp"
#include "deci.hpp"
---- src/libdar/mask.cpp 2005-11-09 19:31:53.000000000 +0100
-+++ src/libdar/mask.cpp 2007-11-01 12:28:34.000000000 +0100
-@@ -31,6 +31,7 @@
+--- src/libdar/database_header.cpp
++++ src/libdar/database_header.cpp 2007/11/06 08:31:15
+@@ -47,6 +47,7 @@
#endif
} // end extern "C"
+#include <cstring>
- #include "mask.hpp"
+ #include "database_header.hpp"
+ #include "compressor.hpp"
#include "tools.hpp"
+--- src/libdar/erreurs.cpp
++++ src/libdar/erreurs.cpp 2007/11/06 08:31:15
+@@ -25,6 +25,7 @@
+ #include "../my_config.h"
+
+ #include <iostream>
++#include <cstdlib>
#include "erreurs.hpp"
---- src/libdar/special_alloc.cpp 2005-06-01 20:54:23.000000000 +0200
-+++ src/libdar/special_alloc.cpp 2007-11-01 12:31:04.000000000 +0100
-@@ -28,6 +28,7 @@
- #include "user_interaction.hpp"
- #include "tools.hpp"
+ #include "infinint.hpp"
+ #include "deci.hpp"
+--- src/libdar/header_version.cpp
++++ src/libdar/header_version.cpp 2007/11/06 08:31:15
+@@ -25,6 +25,7 @@
+
+ #include "../my_config.h"
+#include <cstring>
- #include <list>
- #include <iostream>
- #include
---- src/libdar/tools.cpp 2007-06-21 21:40:37.000000000 +0200
-+++ src/libdar/tools.cpp 2007-11-01 12:29:18.000000000 +0100
-@@ -41,6 +41,8 @@
- # endif
- #endif
+ #include "header_version.hpp"
+ #include "integers.hpp"
-+#include <cstdlib>
-+
- #if HAVE_SYS_TYPES_H
- #include
+--- src/libdar/libdar.cpp
++++ src/libdar/libdar.cpp 2007/11/06 08:31:15
+@@ -525,7 +525,7 @@
+ thread_safe_initialized = true;
+ thread_cancellation::init();
#endif
-
---- src/libdar/user_group_bases.cpp.orig 2007-11-01 12:55:42.000000000 +0100
-+++ src/libdar/user_group_bases.cpp 2007-11-01 12:55:53.000000000 +0100
-@@ -45,6 +45,7 @@ extern "C"
+- if(DAR_LOCALEDIR != "")
++ if(strlen(DAR_LOCALEDIR))
+ if(bindtextdomain(PACKAGE, DAR_LOCALEDIR) == NULL)
+ throw Erange("", "Cannot open the translated messages directory, native language support will not work");
+ #ifdef __DYNAMIC__
+--- src/libdar/mask.cpp
++++ src/libdar/mask.cpp 2007/11/06 08:31:15
+@@ -31,6 +31,7 @@
#endif
- }
+ } // end extern "C"
+#include <cstring>
- #include "erreurs.hpp"
- #include "user_group_bases.hpp"
+ #include "mask.hpp"
#include "tools.hpp"
---- src/libdar/string_file.cpp.orig 2007-11-01 12:53:00.000000000 +0100
-+++ src/libdar/string_file.cpp 2007-11-01 12:53:11.000000000 +0100
-@@ -26,6 +26,7 @@
- #include "../my_config.h"
+ #include "erreurs.hpp"
+--- src/libdar/mask_list.cpp
++++ src/libdar/mask_list.cpp 2007/11/06 08:31:15
+@@ -23,6 +23,7 @@
+ /*********************************************************************/
- #include "string_file.hpp"
+ #include "../my_config.h"
+#include <cstring>
- using namespace std;
-
---- src/libdar/header_version.cpp.orig 2007-11-01 12:44:08.000000000 +0100
-+++ src/libdar/header_version.cpp 2007-11-01 12:44:40.000000000 +0100
-@@ -25,6 +25,7 @@
-
- #include "../my_config.h"
+ extern "C"
+ {
+--- src/libdar/special_alloc.cpp
++++ src/libdar/special_alloc.cpp 2007/11/06 08:31:15
+@@ -28,6 +28,7 @@
+ #include "user_interaction.hpp"
+ #include "tools.hpp"
+#include <cstring>
- #include "header_version.hpp"
- #include "integers.hpp"
-
---- src/libdar/statistics.cpp.orig 2007-11-01 12:54:02.000000000 +0100
-+++ src/libdar/statistics.cpp 2007-11-01 12:54:18.000000000 +0100
-@@ -33,6 +33,7 @@ extern "C"
+ #include <list>
+ #include <iostream>
+ #include
+--- src/libdar/statistics.cpp
++++ src/libdar/statistics.cpp 2007/11/06 08:31:15
+@@ -33,6 +33,7 @@
}
#include <string>
@@ -155,19 +198,19 @@
#include "statistics.hpp"
---- src/libdar/tronconneuse.cpp.orig 2007-11-01 12:47:59.000000000 +0100
-+++ src/libdar/tronconneuse.cpp 2007-11-01 12:48:09.000000000 +0100
-@@ -24,6 +24,7 @@
+--- src/libdar/storage.cpp
++++ src/libdar/storage.cpp 2007/11/06 08:31:15
+@@ -23,6 +23,7 @@
+ /*********************************************************************/
#include "../my_config.h"
-
+#include <cstring>
- #include "tronconneuse.hpp"
- #include "tools.hpp"
-
---- src/libdar/storage.hpp.orig 2007-07-22 18:35:00.000000000 +0200
-+++ src/libdar/storage.hpp 2007-11-01 12:42:03.000000000 +0100
-@@ -215,6 +215,7 @@ namespace libdar
+ #include "storage.hpp"
+ #include "infinint.hpp"
+ #include "generic_file.hpp"
+--- src/libdar/storage.hpp
++++ src/libdar/storage.hpp 2007/11/06 08:31:15
+@@ -215,6 +215,7 @@
{
E_BEGIN;
if(cell != NULL)
@@ -175,7 +218,7 @@
if(offset > 0)
--offset;
else
-@@ -225,6 +226,7 @@ namespace libdar
+@@ -225,6 +226,7 @@
else
offset = OFF_BEGIN;
}
@@ -183,28 +226,18 @@
E_END("storage::iterator::slik_plus_one", "");
}
---- src/libdar/thread_cancellation.cpp.orig 2007-11-01 12:49:21.000000000 +0100
-+++ src/libdar/thread_cancellation.cpp 2007-11-01 12:49:31.000000000 +0100
-@@ -23,6 +23,7 @@
- /*********************************************************************/
-
+--- src/libdar/string_file.cpp
++++ src/libdar/string_file.cpp 2007/11/06 08:31:15
+@@ -26,6 +26,7 @@
#include "../my_config.h"
+
+ #include "string_file.hpp"
+#include <cstring>
- extern "C"
- {
---- src/libdar/database_header.cpp.orig 2007-11-01 12:52:24.000000000 +0100
-+++ src/libdar/database_header.cpp 2007-11-01 12:52:40.000000000 +0100
-@@ -47,6 +47,7 @@ extern "C"
- #endif
- } // end extern "C"
+ using namespace std;
-+#include <cstring>
- #include "database_header.hpp"
- #include "compressor.hpp"
- #include "tools.hpp"
---- src/libdar/mask_list.cpp.orig 2007-11-01 12:51:42.000000000 +0100
-+++ src/libdar/mask_list.cpp 2007-11-01 12:51:53.000000000 +0100
+--- src/libdar/thread_cancellation.cpp
++++ src/libdar/thread_cancellation.cpp 2007/11/06 08:31:15
@@ -23,6 +23,7 @@
/*********************************************************************/
@@ -213,60 +246,79 @@
extern "C"
{
---- src/libdar/storage.cpp.orig 2007-11-01 12:45:49.000000000 +0100
-+++ src/libdar/storage.cpp 2007-11-01 12:45:58.000000000 +0100
-@@ -23,6 +23,7 @@
- /*********************************************************************/
+--- src/libdar/tools.cpp
++++ src/libdar/tools.cpp 2007/11/06 08:31:15
+@@ -41,6 +41,8 @@
+ # endif
+ #endif
+
++#include <cstdlib>
++
+ #if HAVE_SYS_TYPES_H
+ #include
+ #endif
+--- src/libdar/tronconneuse.cpp
++++ src/libdar/tronconneuse.cpp 2007/11/06 08:31:15
+@@ -24,6 +24,7 @@
#include "../my_config.h"
+
+#include <cstring>
- #include "storage.hpp"
- #include "infinint.hpp"
- #include "generic_file.hpp"
---- src/dar_suite/dar_manager.cpp.orig 2007-11-01 12:58:23.000000000 +0100
-+++ src/dar_suite/dar_manager.cpp 2007-11-01 12:58:35.000000000 +0100
-@@ -29,6 +29,7 @@ extern "C"
- #include "getopt_decision.h"
- } // end extern "C"
+ #include "tronconneuse.hpp"
+ #include "tools.hpp"
+
+--- src/libdar/user_group_bases.cpp
++++ src/libdar/user_group_bases.cpp 2007/11/06 08:31:15
+@@ -45,6 +45,7 @@
+ #endif
+ }
+#include <cstring>
- #include <vector>
- #include <string>
- #include "dar_suite.hpp"
---- src/dar_suite/dar_cp.cpp.orig 2007-11-01 12:58:49.000000000 +0100
-+++ src/dar_suite/dar_cp.cpp 2007-11-01 12:59:38.000000000 +0100
-@@ -50,6 +50,8 @@ extern "C"
+ #include "erreurs.hpp"
+ #include "user_group_bases.hpp"
+ #include "tools.hpp"
+--- src/testing/test_blowfish.cpp
++++ src/testing/test_blowfish.cpp 2007/11/06 08:31:15
+@@ -40,6 +40,7 @@
#endif
}
+#include <cstring>
-+#include <cstdlib>
#include <iostream>
- #include "dar_suite.hpp"
---- src/dar_suite/dar_suite.cpp.orig 2007-11-01 12:56:50.000000000 +0100
-+++ src/dar_suite/dar_suite.cpp 2007-11-01 12:57:06.000000000 +0100
-@@ -45,6 +45,7 @@ extern "C"
+ #include "libdar.hpp"
+--- src/testing/test_libdar.cpp
++++ src/testing/test_libdar.cpp 2007/11/06 08:31:53
+@@ -89,7 +89,7 @@
+ void warning(const string &x, void *context)
+ {
+- printf("[%d]%s\n", (U_I)context, x.c_str());
++ printf("[%d]%s\n", (unsigned long)context, x.c_str());
}
-+#include <cstring>
- #include <iostream>
- #include <new>
+ bool question(const string & x, void *context)
+@@ -97,7 +97,7 @@
+ bool rep = false;
+ char r;
+
+- printf("[%d]%s\n", (U_I)context, x.c_str());
++ printf("[%d]%s\n", (unsigned long)context, x.c_str());
+ scanf("%c", &r);
+ rep = r == 'y';
---- src/dar_suite/dar_xform.cpp.orig 2007-11-01 12:57:25.000000000 +0100
-+++ src/dar_suite/dar_xform.cpp 2007-11-01 12:57:36.000000000 +0100
-@@ -33,6 +33,7 @@ extern "C"
- #include "getopt_decision.h"
- } // end extern "C"
+@@ -120,7 +120,7 @@
+ bool has_children,
+ void *context)
+ {
+- ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (U_I)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children");
++ ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (long)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children");
+ }
-+#include <cstring>
- #include <iostream>
- #include "sar.hpp"
- #include "sar_tools.hpp"
---- src/testing/test_tronc.cpp.orig 2007-11-01 13:01:26.000000000 +0100
-+++ src/testing/test_tronc.cpp 2007-11-01 13:01:45.000000000 +0100
-@@ -44,6 +44,7 @@ extern "C"
+ void f2()
+--- src/testing/test_tronc.cpp
++++ src/testing/test_tronc.cpp 2007/11/06 08:31:15
+@@ -44,6 +44,7 @@
} // end extern "C"
#include <iostream>
@@ -274,33 +326,3 @@
#include "libdar.hpp"
#include "tronc.hpp"
---- src/testing/test_blowfish.cpp.orig 2007-11-01 13:02:40.000000000 +0100
-+++ src/testing/test_blowfish.cpp 2007-11-01 13:02:52.000000000 +0100
-@@ -40,6 +40,7 @@ extern "C"
- #endif
- }
-
-+#include <cstring>
- #include <iostream>
-
- #include "libdar.hpp"
---- src/examples/prime.cpp.orig 2007-11-01 13:00:30.000000000 +0100
-+++ src/examples/prime.cpp 2007-11-01 13:00:41.000000000 +0100
-@@ -25,6 +25,7 @@
-
- #include "../my_config.h"
- #include <iostream>
-+#include <cstdlib>
-
- #include "infinint.hpp"
- #include "deci.hpp"
---- src/examples/factoriel.cpp.orig 2007-11-01 12:59:56.000000000 +0100
-+++ src/examples/factoriel.cpp 2007-11-01 13:00:17.000000000 +0100
-@@ -48,6 +48,7 @@ extern "C"
- #endif
- } // end extern "C"
-
-+#include <cstring>
- #include <string>
- #include <iostream>
-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org