From 45f5a3d973b56b5877bcc2e05084585be100f2a8 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 5 Aug 2011 19:15:05 +0200
Subject: [PATCH] Move from libsatsolver to libsolv.

---
 po/pakfire.pot    |  2 +-
 setup.py          |  2 +-
 src/pool.c        |  2 +-
 src/pool.h        |  2 +-
 src/problem.h     |  4 ++--
 src/relation.h    |  2 +-
 src/repo.c        |  6 +++---
 src/repo.h        |  2 +-
 src/request.c     |  2 +-
 src/request.h     |  2 +-
 src/solution.c    |  4 ++--
 src/solvable.c    |  2 +-
 src/solvable.h    |  2 +-
 src/solver.c      |  2 +-
 src/solver.h      |  2 +-
 src/step.h        |  4 ++--
 src/transaction.c | 10 +++-------
 src/transaction.h |  2 +-
 src/util.h        |  2 +-
 19 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/po/pakfire.pot b/po/pakfire.pot
index b4d8631df..8e94911e0 100644
--- a/po/pakfire.pot
+++ b/po/pakfire.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 18:22+0200\n"
+"POT-Creation-Date: 2011-08-05 19:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/setup.py b/setup.py
index d5cced39c..05d417a1b 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ setup(
 	],
 	ext_modules = [
 		Extension("pakfire._pakfire", _pakfire_module_files,
-			extra_link_args = ["-lsatsolver", "-lsatsolverext"])
+			extra_link_args = ["-lsolv", "-lsolvext"])
 	],
 	cmdclass = { "build" : build_extra.build_extra,
 	             "build_i18n" :  build_i18n.build_i18n },
diff --git a/src/pool.c b/src/pool.c
index bfd0977ec..4a2fc6829 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -1,6 +1,6 @@
 
 #include <Python.h>
-#include <satsolver/poolarch.h>
+#include <solv/poolarch.h>
 
 #include "config.h"
 #include "pool.h"
diff --git a/src/pool.h b/src/pool.h
index 0da71936e..70a8a13c6 100644
--- a/src/pool.h
+++ b/src/pool.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/pool.h>
+#include <solv/pool.h>
 
 // Sat Pool object
 typedef struct {
diff --git a/src/problem.h b/src/problem.h
index 15b3722ca..6cb97715c 100644
--- a/src/problem.h
+++ b/src/problem.h
@@ -4,8 +4,8 @@
 
 #include <Python.h>
 
-#include <satsolver/pool.h>
-#include <satsolver/solver.h>
+#include <solv/pool.h>
+#include <solv/solver.h>
 
 // Sat Problem object
 typedef struct {
diff --git a/src/relation.h b/src/relation.h
index 0ba8a4fa1..c9557fa93 100644
--- a/src/relation.h
+++ b/src/relation.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/pool.h>
+#include <solv/pool.h>
 
 // Sat Relation object
 typedef struct {
diff --git a/src/repo.c b/src/repo.c
index db47c2b01..4a8ab43c5 100644
--- a/src/repo.c
+++ b/src/repo.c
@@ -1,9 +1,9 @@
 
 #include <Python.h>
 #include <stdbool.h>
-#include <satsolver/repo.h>
-#include <satsolver/repo_solv.h>
-#include <satsolver/repo_write.h>
+#include <solv/repo.h>
+#include <solv/repo_solv.h>
+#include <solv/repo_write.h>
 
 #include "pool.h"
 #include "repo.h"
diff --git a/src/repo.h b/src/repo.h
index 2b89a3282..46894e6bf 100644
--- a/src/repo.h
+++ b/src/repo.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/repo.h>
+#include <solv/repo.h>
 
 // Sat Repo object
 typedef struct {
diff --git a/src/request.c b/src/request.c
index bd1ea50b4..07e7b613d 100644
--- a/src/request.c
+++ b/src/request.c
@@ -4,7 +4,7 @@
 #include "request.h"
 #include "solvable.h"
 
-#include <satsolver/solver.h>
+#include <solv/solver.h>
 
 PyTypeObject RequestType = {
 	PyObject_HEAD_INIT(NULL)
diff --git a/src/request.h b/src/request.h
index a8c93c301..92869a008 100644
--- a/src/request.h
+++ b/src/request.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/queue.h>
+#include <solv/queue.h>
 
 // Sat Request object
 typedef struct {
diff --git a/src/solution.c b/src/solution.c
index 469cb32f4..0fae131b0 100644
--- a/src/solution.c
+++ b/src/solution.c
@@ -1,8 +1,8 @@
 
 #include <Python.h>
 
-#include <satsolver/policy.h>
-#include <satsolver/solverdebug.h>
+#include <solv/policy.h>
+#include <solv/solverdebug.h>
 
 #include "config.h"
 #include "problem.h"
diff --git a/src/solvable.c b/src/solvable.c
index 602db6012..e89c485ab 100644
--- a/src/solvable.c
+++ b/src/solvable.c
@@ -44,7 +44,7 @@ PyObject* Solvable_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
 		solv->arch = pool_str2id(self->_pool, arch, 1);
 
 		/* add self-provides */
-		Id rel = rel2id(self->_pool, solv->name, solv->evr, REL_EQ, 1);
+		Id rel = pool_rel2id(self->_pool, solv->name, solv->evr, REL_EQ, 1);
 		solv->provides = repo_addid_dep(repo->_repo, solv->provides, rel, 0);
 	}
 
diff --git a/src/solvable.h b/src/solvable.h
index 5ff6daa97..bd82be12e 100644
--- a/src/solvable.h
+++ b/src/solvable.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/solvable.h>
+#include <solv/solvable.h>
 
 // Sat Solvable object
 typedef struct {
diff --git a/src/solver.c b/src/solver.c
index 7962d2ff4..ee2cb1378 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -4,7 +4,7 @@
 #include "request.h"
 #include "solver.h"
 
-#include <satsolver/solverdebug.h>
+#include <solv/solverdebug.h>
 
 PyTypeObject SolverType = {
 	PyObject_HEAD_INIT(NULL)
diff --git a/src/solver.h b/src/solver.h
index 38d9aba7a..245edecec 100644
--- a/src/solver.h
+++ b/src/solver.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/solver.h>
+#include <solv/solver.h>
 
 // Sat Solver object
 typedef struct {
diff --git a/src/step.h b/src/step.h
index b5a016da0..07ce3317e 100644
--- a/src/step.h
+++ b/src/step.h
@@ -4,8 +4,8 @@
 
 #include <Python.h>
 
-#include <satsolver/pool.h>
-#include <satsolver/transaction.h>
+#include <solv/pool.h>
+#include <solv/transaction.h>
 
 // Sat Step object
 typedef struct {
diff --git a/src/transaction.c b/src/transaction.c
index 05ac855cc..1208aa303 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -1,7 +1,7 @@
 
 #include <Python.h>
 
-#include <satsolver/transaction.h>
+#include <solv/transaction.h>
 
 #include "solver.h"
 #include "step.h"
@@ -33,12 +33,8 @@ PyObject* Transaction_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
 			return NULL;
 		}
 
-		/* When the solver is freed we still need the transaction. For that,
-		   we copy it to be independent. */
-		self->_transaction = malloc(sizeof(Transaction));
-		memcpy(self->_transaction, &solver->_solver->trans, sizeof(Transaction));
-
-		// order the transaction right from the start.
+		// Create a new transaction from the solver and order it.
+		self->_transaction = solver_create_transaction(solver->_solver);
 		transaction_order(self->_transaction, 0);
 	}
 
diff --git a/src/transaction.h b/src/transaction.h
index 959c975c7..71e50c3bf 100644
--- a/src/transaction.h
+++ b/src/transaction.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/transaction.h>
+#include <solv/transaction.h>
 
 // Sat Transaction object
 typedef struct {
diff --git a/src/util.h b/src/util.h
index e43bc484a..efd72e015 100644
--- a/src/util.h
+++ b/src/util.h
@@ -4,7 +4,7 @@
 
 #include <Python.h>
 
-#include <satsolver/evr.h>
+#include <solv/evr.h>
 
 extern PyObject *version_compare(PyObject *self, PyObject *args);
 
-- 
2.39.5