1.1 --- a/configure.ac Thu Jul 09 08:23:50 2009 +0100
1.2 +++ b/configure.ac Thu Aug 13 12:42:26 2009 +0100
1.3 @@ -54,7 +54,7 @@
1.4 ##################################################
1.5 # Checks for libraries.
1.6 ##################################################
1.7 -PKG_CHECK_MODULES(RAZOR,[razor],[:],[RAZOR_LIBS=-lrazor])
1.8 +PKG_CHECK_MODULES(RAZOR,[razor >= 0.2],[:],[RAZOR_LIBS=-lrazor])
1.9 PKG_CHECK_MODULES(EXPAT,[expat],[:],[EXPAT_LIBS=-lexpat])
1.10 PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz])
1.11 LIBPLOVER_CFLAGS="$RAZOR_CFLAGS $EXPAT_CFLAGS $ZLIB_CFLAGS"
2.1 --- a/plover/razor.c Thu Jul 09 08:23:50 2009 +0100
2.2 +++ b/plover/razor.c Thu Aug 13 12:42:26 2009 +0100
2.3 @@ -99,7 +99,6 @@
2.4 {
2.5 struct razor_install_iterator *ii;
2.6 struct razor_package *package;
2.7 - struct razor_set *set;
2.8 enum razor_install_action action;
2.9 struct razor_rpm *rpm;
2.10 const char *name,*version,*arch;
2.11 @@ -107,14 +106,14 @@
2.12 int count;
2.13 ii=razor_set_create_install_iterator(system,next);
2.14 printf("Running Transaction\n");
2.15 - while (razor_install_iterator_next(ii,&set,&package,&action,&count))
2.16 + while (razor_install_iterator_next(ii,&package,&action,&count))
2.17 {
2.18 if (action==RAZOR_INSTALL_ACTION_REMOVE)
2.19 {
2.20 - razor_package_get_details(set,package,RAZOR_DETAIL_NAME,&name,
2.21 + razor_package_get_details(system,package,RAZOR_DETAIL_NAME,&name,
2.22 RAZOR_DETAIL_LAST);
2.23 printf(" Removing : %s ",name);
2.24 - if (razor_package_remove(set,package,install_root,0)<0)
2.25 + if (razor_package_remove(system,next,package,install_root,count)<0)
2.26 printf(
2.27 "\nWarning: one or more errors occurred while removing %s",
2.28 name);
2.29 @@ -122,7 +121,7 @@
2.30 }
2.31 else
2.32 {
2.33 - razor_package_get_details(set,package,RAZOR_DETAIL_NAME,&name,
2.34 + razor_package_get_details(next,package,RAZOR_DETAIL_NAME,&name,
2.35 RAZOR_DETAIL_VERSION,&version,RAZOR_DETAIL_ARCH,&arch,
2.36 RAZOR_DETAIL_LAST);
2.37 printf(" Installing : %s ",name);