Add librpm-tizen.spec file. 65/297965/23
authorxuhy <huayong.xu@samsung.com>
Tue, 29 Aug 2023 08:20:00 +0000 (16:20 +0800)
committerxuhy <huayong.xu@samsung.com>
Thu, 31 Aug 2023 02:20:47 +0000 (10:20 +0800)
Change-Id: I0b2d02a582dfc2aecb95d4c0b817250fdd303ff0

31 files changed:
Makefile.am
configure.ac
lib/backend/dbconfig.c
packaging/db-4.8.30-integration.dif [new file with mode: 0644]
packaging/device-sec-policy [new file with mode: 0644]
packaging/find-docs.sh [new file with mode: 0644]
packaging/find-provides.ksyms [new file with mode: 0755]
packaging/librpm-tizen.changes [new file with mode: 0644]
packaging/librpm-tizen.spec [new file with mode: 0644]
packaging/rpm-tizen_macros [new file with mode: 0644]
packaging/rpm.changes [new file with mode: 0644]
packaging/rpm.manifest [new file with mode: 0644]
packaging/rpmconfigcheck [new file with mode: 0644]
python/Makefile.am
python/header-py.c
python/rpm/__init__.py [deleted file]
python/rpm/__init__.py.in [new file with mode: 0644]
python/rpm/transaction.py [deleted file]
python/rpm/transaction.py.in [new file with mode: 0644]
python/rpmds-py.c
python/rpmfd-py.c
python/rpmfi-py.c
python/rpmii-py.c
python/rpmkeyring-py.c
python/rpmmi-py.c
python/rpmps-py.c
python/rpmte-py.c
python/rpmts-py.c
python/setup.py.in
python/spec-py.c
rpm.am

index 77fe7eec2eb30717c7dd78ff2ec77f3aa059e8c3..db85ea6017cb2f66bb77c957bf16f18c9c66f2a9 100644 (file)
@@ -209,7 +209,7 @@ dist_bin_SCRIPTS =  scripts/gendiff
 
 bin_PROGRAMS +=                rpmqpack
 rpmqpack_SOURCES =      rpmqpack.c
-rpmqpack_LDADD =        lib/librpm.la
+rpmqpack_LDADD =        lib/librpm.la @WITH_DB_LIB@
 rpmqpack_CFLAGS =       $(CFLAGS) -fPIE
 rpmqpack_LDFLAGS =      $(LDFLAGS) -pie
 
index 0c29311eb0af51ea52fc364d864dcb641fd7e3c2..a0f9d1ffdc5543cd92f2512b9886cc0a683757b0 100644 (file)
@@ -529,12 +529,13 @@ yes )
        #error Berkeley DB too old
        #endif
       ])
-    ],[ WITH_DB_LIB=-ldb ], 
+    ],[ WITH_DB_LIB=-ldb ],
       [ AC_MSG_ERROR([Berkeley DB version >= 4.5 required])
     ])
   ],[
     AC_MSG_ERROR([missing required header db.h])
   ])
+  AC_DEFINE(WITH_EXTERNAL_DB, 1, [Use external db?])
   ;;
 no|maybe )
   # Try internal database first, then fall back to external
@@ -1151,8 +1152,7 @@ AC_ARG_WITH([rpmconfigdir],
             [AS_HELP_STRING([--with-rpmconfigdir],
               [Set up rpm config not into /usr/lib/rpm @<:@default=check@:>@])],
             [RPMCONFIGDIR=$withval],
-            [RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"])
-
+            [RPMCONFIGDIR="`echo ${libdir}/rpm`"])
 AC_SUBST(RPMCONFIGDIR)
 
 AC_SUBST(OBJDUMP)
@@ -1165,6 +1165,13 @@ AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no])
 AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no])
 AM_CONDITIONAL([HACKINGDOCS],[test "$with_hackingdocs" = yes])
 
+AC_ARG_VAR([PYTHON_MODULENAME], [Name of the rpm python module. Defaults to 'rpm'])
+if test X"$PYTHON_MODULENAME" = X ; then
+    PYTHON_MODULENAME="$PACKAGE"
+fi
+AC_DEFINE_UNQUOTED(PYTHON_MODULENAME, ["$PYTHON_MODULENAME"],[python module name])
+AC_SUBST(PYTHON_MODULENAME)
+
 AC_PATH_PROG(AUTOM4TE,autom4te,:)
 
 AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])
@@ -1172,9 +1179,11 @@ AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])
 AC_CONFIG_FILES([Makefile
        rpmio/Makefile lib/Makefile build/Makefile sign/Makefile
        po/Makefile.in scripts/Makefile fileattrs/Makefile
-       misc/Makefile 
+       misc/Makefile
        doc/Makefile
        python/Makefile
+       python/rpm/__init__.py
+       python/rpm/transaction.py
        luaext/Makefile
        tests/Makefile
        plugins/Makefile
index fe7c01e81465e33258b54fb6f5f78fecb7c3f832..b9773fe910c167e9273eeef05238d5ed1774b890 100644 (file)
@@ -71,8 +71,10 @@ static const struct poptOption rdbOptions[] = {
        NULL, NULL },
  { "lockdbfd", 0,POPT_ARG_NONE,        &staticdbi.dbi_lockdbfd, 0,
        NULL, NULL },
+ #ifndef WITH_EXTERNAL_DB
  { "nofsync",  0,POPT_BIT_SET,         &staticdbi.dbi_oflags, DB_NOFSYNC,
        NULL, NULL },
+#endif
 
     POPT_TABLEEND
 };
diff --git a/packaging/db-4.8.30-integration.dif b/packaging/db-4.8.30-integration.dif
new file mode 100644 (file)
index 0000000..dbfb293
--- /dev/null
@@ -0,0 +1,82 @@
+--- db/db/db.c.orig    2010-04-12 20:25:22.000000000 +0000
++++ db/db/db.c 2011-05-12 11:38:59.000000000 +0000
+@@ -646,6 +646,8 @@ __env_mpool(dbp, fname, flags)
+                       MAKE_INMEM(dbp);
+               return (ret);
+       }
++      if (LF_ISSET(DB_NOFSYNC) && mpf->mfp)
++          F_SET(mpf->mfp, MP_NOFSYNC);
+       /*
+        * Set the open flag.  We use it to mean that the dbp has gone
+--- db/db/db_iface.c.orig      2010-04-12 20:25:22.000000000 +0000
++++ db/db/db_iface.c   2011-05-12 11:21:32.000000000 +0000
+@@ -1230,6 +1230,7 @@ __db_open_arg(dbp, txn, fname, dname, ty
+ #define       OKFLAGS                                                         \
+       (DB_AUTO_COMMIT | DB_CREATE | DB_EXCL | DB_FCNTL_LOCKING |      \
+       DB_MULTIVERSION | DB_NOMMAP | DB_NO_AUTO_COMMIT | DB_RDONLY |   \
++      DB_NOFSYNC |                                                    \
+       DB_RDWRMASTER | DB_READ_UNCOMMITTED | DB_THREAD | DB_TRUNCATE)
+       if ((ret = __db_fchk(env, "DB->open", flags, OKFLAGS)) != 0)
+               return (ret);
+--- db/dbinc/mp.h.orig 2010-04-12 20:25:22.000000000 +0000
++++ db/dbinc/mp.h      2011-05-12 12:01:32.000000000 +0000
+@@ -467,6 +467,7 @@ struct __mpoolfile {
+ #define       MP_FAKE_UOC             0x080   /* Unlink_on_close field: fake flag. */
+ #define       MP_NOT_DURABLE          0x100   /* File is not durable. */
+ #define       MP_TEMP                 0x200   /* Backing file is a temporary. */
++#define       MP_NOFSYNC              0x400   /* Don't fsync */
+       u_int32_t  flags;
+ };
+--- db/dbinc_auto/api_flags.in.orig    2011-05-12 11:40:57.000000000 +0000
++++ db/dbinc_auto/api_flags.in 2011-05-12 11:55:10.000000000 +0000
+@@ -83,6 +83,7 @@
+ #define       DB_NOORDERCHK                           0x00000002
+ #define       DB_NOPANIC                              0x00000800
+ #define       DB_NO_AUTO_COMMIT                       0x00001000
++#define       DB_NOFSYNC                              0x00040000
+ #define       DB_ODDFILESIZE                          0x00000080
+ #define       DB_ORDERCHKONLY                         0x00000004
+ #define       DB_OVERWRITE                            0x00001000
+--- db/dist/s_config.orig      2010-04-12 20:25:23.000000000 +0000
++++ db/dist/s_config   2011-05-12 12:00:34.000000000 +0000
+@@ -8,7 +8,8 @@ trap 'rm -f aclocal.m4 ; exit 0' 0 1 2 3
+ . ./RELEASE
+ echo "autoconf: building aclocal.m4..."
+-cat aclocal/*.m4 aclocal_java/*.m4 > aclocal.m4
++cat aclocal/*.m4 aclocal_java/*.m4 > acinclude.m4
++aclocal
+ echo "autoconf: running autoheader to build config.hin..."
+ rm -f config.hin
+--- db/mp/mp_sync.c.orig       2010-04-12 20:25:34.000000000 +0000
++++ db/mp/mp_sync.c    2011-05-12 11:36:58.000000000 +0000
+@@ -578,7 +578,7 @@ done:      /*
+       if (ret == 0 && required_write) {
+               if (dbmfp == NULL)
+                       ret = __memp_sync_files(env);
+-              else
++              else if (!F_ISSET(dbmfp->mfp, MP_NOFSYNC))
+                       ret = __os_fsync(env, dbmfp->fhp);
+       }
+@@ -665,7 +665,7 @@ __memp_sync_file(env, mfp, argp, countp,
+                           "%s: unable to flush", (char *)
+                           R_ADDR(dbmp->reginfo, mfp->path_off));
+               }
+-      } else
++      } else if (!F_ISSET(dbmfp->mfp, MP_NOFSYNC))
+               ret = __os_fsync(env, dbmfp->fhp);
+       /*
+@@ -801,6 +801,8 @@ __memp_mf_sync(dbmp, mfp, locked)
+       COMPQUIET(hp, NULL);
+       env = dbmp->env;
++      if (F_ISSET(mfp, MP_NOFSYNC))
++          return 0;
+       /*
+        * We need to be holding the hash lock: we're using the path name
+        * and __memp_nameop might try and rename the file.
diff --git a/packaging/device-sec-policy b/packaging/device-sec-policy
new file mode 100644 (file)
index 0000000..83c0c46
--- /dev/null
@@ -0,0 +1,46 @@
+<config>
+  <sw_source name="root" rankkey="/10020/10000.root">
+    <origin>
+      <keyinfo>
+mQENBE6MJTABCAC6pAFNW9tCbLQtgmwxzNf7ftSL5RrsjVTlPtpyeFLhxSmqmeHr
+KB10C6Co1zYB/fW8zvGXU613g3WEo4SKlS2lnOVBxviet0qn58zwCQASbdFYtckk
+thtkxiSInoKbj4n/Z+hHB9dvcyqcWqp2IFQEDDpxgP4KuzCvvj6W+e9EtYsdGt9P
+ZHsVjIAe0w+j7Hs4Q7FYWD+mdQAjgBsLlc16Ci8EPYnvBL/xdbJ3Ryfi59tTdfGG
+HnwpjM2J1WshooyvsOtHZU+T1nHtuegEzdRMVFo502Lkb60dJRsREE2iyPWFX2TE
+ZdaQqUMmkPaROUlWhGBSWIKbOVARwWBn94KDABEBAAG0CXJvb3QudGVzdIkBPgQT
+AQIAKAUCTowlMAIbAwUJA8JnAAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ
+TTk+Qq2l7P210wgApKVLpdve9jDsy/y//gSAGvfA4fXFuGhHkH5+QW7L+QkUAo0Z
+vv0KB0Pw5qZjV+k8jlq3Q3f/vcIEKxc40d0coa3m+bUlL2vy0+0gLSTiZ4MNFAk5
+LvJgEj+7ks75/qtJVWfCZeXo9NiugSoW9D+jNflmfstd8k2wT2ucH7IJHHzK1lGm
+vZHXeJeSULRHiibVyK5cG+NH/1Akuxkgo2jOzqhLjhp4/UiJlyAD0k/J4ULfmWp8
+C9/sIhWBoS5OcrtMVQtUMTx85I2dEC/01hnfLUk8mi5VscLu3xQoJ9hNrMEgji6H
+S+MmxcPGnVziEA0Z7VNN6DpuG/xZ1i9fgXXVfLkBDQROjCUwAQgA6fyD7eqaoah/
+za0X+Xv3o1y52UHmeHMmyzM/W4UlVsd01h7KzSHWyQKHi0i0pxRtUj+pkV+r+QjV
+BiAowq2HVpyXsmre29PEgAuIVv6/pZjfZEWFKjSDsvdXpS+mT+J6LjRxYh7ZbGvv
+SR3hMiMocWYENj13XDRw5USGhC0UxlmmMfjQfWJ6eHeQTiyZWW+CZUAJ2IbEkPVP
+nBDH/fTuVMfOo4g0HwqUSJmwV47BPLec1ArSaPG1YgKX1Y+UYoNfUvo/ieiF59At
+A8UbjQMzZggIfkvJsDL8U5n4ojFL8Rs/aMYuH76OlA4wuKPAnBSt+fVBnjaAAadf
+FCy/CHZt/wARAQABiQElBBgBAgAPBQJOjCUwAhsMBQkDwmcAAAoJEE05PkKtpez9
+S7IH/j44MxOP6dAycQAreWVAzdMiw82DjP7c6jMxYZj8ss1x++iO5GW82qm0WJ6h
+IOEdll+wBhPX0acKvE4KrlNzfsB2WzDRwOyiZfuSQI0J3Jrytj8zyCVKwHTsI8VC
+RkOzaMYsEqmPc+ve+wxxcwWXC0EtoyhMRjRZlMy55IeJcEfM8bcE4wcsyotsura6
+o1fmU223Xj1k5xXxDvXalPUoXnhvsev7kMBnIQRac194qkSkTzVXGLGu5Ng7Bfxl
+BMhf6RSk31+Q43ASbn4ralnswMhsHSatJIeasbHyvsTJzMnfEoSdpb8/dQI8KnHf
+tRrR5cbqmVr8tkFjS/QK6TWfNMM=
+</keyinfo>
+    </origin>
+    <package name="unknown-sw-source"/>
+    <package name="ac-domain-system">
+      <provide>
+        <ac_domain name="_" policy="shared"/>
+        <ac_domain name="Isolated"/>
+      </provide>
+    </package>
+    <package name="root"/>
+    <sw_source name="_default_" rankkey="/10020/11000/10000._default_">
+      <allow>
+        <ac_domain match="*"/>
+      </allow>
+    </sw_source>
+  </sw_source>
+</config>
diff --git a/packaging/find-docs.sh b/packaging/find-docs.sh
new file mode 100644 (file)
index 0000000..afe4e22
--- /dev/null
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+usage () {
+cat << EOF
+Usage: $0 TOP_DIR
+
+EOF
+exit 1
+}
+
+if [ -z "$1" ] ; then usage
+elif [ $1 = / ] ; then echo $0: expects non-/ argument for '$1' 1>&2
+elif [ ! -d $1 ] ; then
+ echo $0: $1: no such directory
+ exit 1
+else TOP_DIR="`echo $1|sed -e 's:/$::'`"
+fi
+shift
+
+DOC_NAME=documentation.list
+touch $DOC_NAME
+
+find $TOP_DIR -type f -o -type l | sed '
+s:'"$TOP_DIR"'::
+s:\(.*/man/man./.*\.[0-9]\):%doc \1:
+s:\(.*/man/*/man./.*\.[0-9]\):%doc \1:
+s:\(.*/gtk-doc/html/.*\):%doc \1:
+s:\(.*/info/.*\info.*\):%doc \1:
+s:^\([^%].*\)::
+/^$/d' >> $DOC_NAME
+
+
+exit 0
diff --git a/packaging/find-provides.ksyms b/packaging/find-provides.ksyms
new file mode 100755 (executable)
index 0000000..c8f2ccd
--- /dev/null
@@ -0,0 +1,41 @@
+#! /bin/sh
+
+IFS=$'\n'
+
+case "$1" in
+kernel-module-*)    ;; # Fedora kernel module package names start with
+                      # kernel-module.
+kernel*)           kernel_flavor=${1#kernel-} ;;
+esac
+
+trap 'rm -f "$tmp"' EXIT
+tmp=$(mktemp)
+while read f; do
+    test -e "$f" || continue
+    case "$f" in
+    *.debug)
+        continue
+        ;;
+    */lib/modules/*/*.ko | */lib/modules/*/*.ko.gz | */boot/vmlinu[xz]*)
+        ;;
+    *)
+        continue
+    esac
+    unzip=false
+    case "$f" in
+    *.gz | */boot/vmlinuz*)
+        unzip=true
+    esac
+    if $unzip && gzip -cd "$f" >"$tmp"; then
+        f=$tmp
+    fi
+    flavor=$(/usr/sbin/modinfo -F vermagic "$f")
+    flavor=${flavor%% *}
+    flavor=${flavor##*-}
+    if test -z "$flavor"; then
+        flavor=$kernel_flavor
+    fi
+    nm "$f" \
+    | sed -r -ne "s/^0*([0-9a-f]+) A __crc_(.+)/ksym($flavor:\\2) = \\1/p"
+done \
+| sort -u
diff --git a/packaging/librpm-tizen.changes b/packaging/librpm-tizen.changes
new file mode 100644 (file)
index 0000000..ee80cf4
--- /dev/null
@@ -0,0 +1,42 @@
+* Wed Jul 23 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen-tools/4.11.0.1.tizen20140530-20140723
+- Rebase on latest Tizen 3.0
+- packaging: enable lua 5.2 for openSUSE
+- rpm-packaging: enable customized autoreq
+
+* Thu Mar 06 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen-tools/4.11.0.1.tizen20130618-20140306
+- Fix build against Lua 5.2
+
+* Tue Oct 01 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 4.11.0.1.tizen20130618
+- lua: fall through failed lua scripts
+- lua: Enable Lua
+- Ignore bad expressions in %if conditionals
+
+* Wed Aug 21 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 4.11.0.1.tizen20130618
+- fix segmentation fault error while parsing spec
+- Bump the log level of "unexpanded script" msg
+- Prevent execution of arbitrary scripts
+
+* Tue Jun 18 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 4.11.0.1.tizen20130618
+- Version bump to latest from Tizen 3.0
+
+* Thu Mar 07 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 4.11.0.1.tizen20130304
+- Version bump to latest from Tizen
+
+* Wed Feb 27 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 4.10.91.tizen20121215
+- Enable lua
+- update package Provide info
+- Add a provide tag to make gbs depend on new changes
+- packaging: fix Makefile
+- Install Tizen macros
+
+* Mon Feb 25 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 4.10.91.tizen20121215
+- packaging: Disable autoreq, too
+- Ignore unknown internal scripts
+
+* Thu Feb 22 2013 Qiang Zhang <qiang.z.zhang@intel.com> 4.10.91.tizen20121215
+- packaging: fix build for CentOS
+
+* Thu Feb 21 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 4.10.91.tizen20121215
+- packaging: Drop bdb sources
+- packaging: fix build for Fedora (18)
+- packaging: disable autoprov
diff --git a/packaging/librpm-tizen.spec b/packaging/librpm-tizen.spec
new file mode 100644 (file)
index 0000000..a565017
--- /dev/null
@@ -0,0 +1,173 @@
+# Use custom autoreq script for filtering out all librpm* stuff
+# (basically everything that the package would auto-provide) in order to make
+# the package installable
+%define _use_internal_dependency_generator 0
+%define __find_requires bash -c "/usr/lib/rpm/find-requires | grep -v librpm"
+
+%define rpmlibdir %{_prefix}/lib
+%define rpmhome %{rpmlibdir}/rpm
+
+Name:           librpm-tizen
+Summary:        The RPM libraries for git-buildpackage
+License:        GPL-2.0+
+Group:          Development/Tools/Building
+Version:        4.14.1.1.tizen20230628
+Release:        0
+Url:            http://www.rpm.org
+BuildRequires:  binutils
+BuildRequires:  bzip2
+BuildRequires:  file-devel
+BuildRequires:  findutils
+BuildRequires:  gcc
+BuildRequires:  glibc-devel
+BuildRequires:  gzip
+BuildRequires:  libacl-devel
+BuildRequires:  pkgconfig(libcap)
+BuildRequires:  libelf-devel
+BuildRequires:  libtool
+%if 0%{?suse_version}
+BuildRequires:  pkgconfig(lua)
+%else
+BuildRequires:  lua-devel
+%endif
+BuildRequires:  make
+BuildRequires:  pkgconfig(ncurses)
+BuildRequires:  patch
+%if 0%{?fedora} || 0%{?centos_ver} || 0%{?centos_version}
+BuildRequires:  popt-devel
+%else
+BuildRequires:  pkgconfig(popt)
+%endif
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(nss)
+BuildRequires:  pkg-config
+%if 0%{?centos_ver} || 0%{?centos_version}
+BuildRequires:  python-devel
+%else
+BuildRequires:  pkgconfig(python) >= 2.6
+%endif
+# Disable security
+%if 0
+BuildRequires:  uthash-devel
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libsmack)
+%endif
+BuildRequires:  libarchive-devel
+%if 0%{?suse_version}
+BuildRequires:  fdupes
+%endif
+%if 0%{?fedora} || 0%{?centos_ver} >= 7
+BuildRequires:  libdb-devel
+%else
+BuildRequires:  db-devel
+%endif
+BuildRequires:  pkgconfig(libzstd)
+
+Source4:       rpm-tizen_macros
+Source8:       rpmconfigcheck
+Source13:      find-docs.sh
+Source22:      device-sec-policy
+Source23:      find-provides.ksyms
+Source1001:    rpm.manifest
+Source0:       rpm-%{version}.tar.gz
+AutoProv:      No
+
+Provides:      rpm-tizen = %{version}-tizen20230628
+#
+# avoid bootstrapping problem
+%define _binary_payload w9.bzdio
+#
+# Python module name
+%define python_mod_name rpm_tizen
+
+%description
+RPM Package Manager is the main tool for managing the software packages
+of Tizen.
+
+RPM can be used to install and remove software packages. With rpm, it
+is easy to update packages.  RPM keeps track of all these manipulations
+in a central database. This way it is possible to get an overview of
+all installed packages.  RPM also supports database queries.
+
+This is a special stripped-down version of RPM, only intended to be used by the
+git-buildpackage tool. This package doesn't interfere with the RPM libraries of
+the host system and it only contains rpmlib and rpm-python.
+
+%prep
+%setup -q -n rpm-%{version}
+cp %{SOURCE1001} .
+rm -rf sqlite
+if [ -s %{_sysconfdir}/rpm/tizen_macros ]; then
+    cp -a %{_sysconfdir}/rpm/tizen_macros %{SOURCE4}
+fi
+cp -a %{SOURCE4} tizen_macros
+rm -f m4/libtool.m4
+rm -f m4/lt*.m4
+
+%build
+CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
+export CPPFLAGS
+export CFLAGS="%{optflags} -ffunction-sections -fstack-protector-strong -Wl,-z,relro -D_FORTIFY_SOURCE=2 -fPIE"
+export LDFLAGS="${LDFLAGS} -pie -Wl,-Bsymbolic-functions -ffunction-sections"
+%ifarch armv5tel
+export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections"
+%endif
+
+%{?hwasan_build:
+export CPPFLAGS="$CPPFLAGS -DHWASAN_BUILD"
+}
+
+autoreconf -i -f
+
+%configure \
+    --libdir=%{_libdir}/%{name} \
+    --disable-dependency-tracking \
+    --with-lua \
+    --with-acl \
+    --with-cap \
+    --enable-shared \
+    --enable-python \
+    --with-vendor=tizen \
+    --without-msm \
+    --enable-zstd \
+    --with-external-db \
+    PYTHON_MODULENAME=%{python_mod_name}
+
+make %{?_smp_mflags}
+
+%install
+# Install into a temporary location
+make install DESTDIR="`pwd`/tmp_install"
+
+# And only copy the files that we want
+install -d %{buildroot}%{_libdir}/%{name}
+install -d %{buildroot}%{python_sitearch}
+cp -ax tmp_install/%{_libdir}/%{name}  %{buildroot}%{_libdir}/
+cp -ax tmp_install/%{python_sitearch}/%{python_mod_name} %{buildroot}%{python_sitearch}/
+
+# Install extra sources
+install -m644 %{SOURCE4} %{buildroot}%{_libdir}/%{name}/rpm/tizen_macros
+install -d %{buildroot}%{_libdir}/%{name}/rpm/tizen
+ln -s ../tizen_macros %{buildroot}%{_libdir}/%{name}/rpm/tizen/macros
+
+# Delete unwanted development files etc.
+find %{buildroot} -name "*.la" | xargs rm -f --
+find %{buildroot}/%{_libdir}/%{name} -name "*.so" | xargs rm -f --
+rm -rf "%{buildroot}%{_libdir}/%{name}/pkgconfig"
+rm -rf "%{buildroot}%{_libdir}/%{name}/rpm-plugins"
+
+# Compile python modules (Fedora does this automatically) and find duplicates
+%if 0%{?suse_version}
+%py_compile %{buildroot}/%{python_sitearch}/%{python_mod_name}/
+%py_compile -O %{buildroot}/%{python_sitearch}/%{python_mod_name}/
+
+%fdupes %{buildroot}/%{python_sitearch}/
+%endif
+
+%files
+%defattr(-,root,root,-)
+%dir %{_libdir}/%{name}
+%dir %{python_sitearch}/%{python_mod_name}/
+%{_libdir}/%{name}/*.so.*
+%{_libdir}/%{name}/rpm
+%{python_sitearch}/%{python_mod_name}/*
diff --git a/packaging/rpm-tizen_macros b/packaging/rpm-tizen_macros
new file mode 100644 (file)
index 0000000..e7648f9
--- /dev/null
@@ -0,0 +1,305 @@
+# directories
+%_infodir               %{_prefix}/share/info
+%_mandir                %{_prefix}/share/man
+%_sysconfdir            /etc
+%_localstatedir         /var
+%_defaultdocdir         %{_usr}/share/doc/packages
+%_unitdir_user /usr/lib/systemd/user
+%_unitdir /usr/lib/systemd/system
+
+# package build macros
+# %make_install           make install DESTDIR=%{?buildroot}
+# %makeinstall            make DESTDIR=%{?buildroot:%{buildroot}} install
+%rb_arch                %(echo %{_host_cpu}-linux | sed -e "s/i686/i586/" -e "s/armv5tel/armv4l/" -e "s/hppa2.0/hppa/")
+%rb_ver                 %(/usr/bin/ruby -e 'puts VERSION.sub(/\\\.\\\d$/, "")')
+
+# external kernel module helper macro(s)
+%kernel_devel_uname_r %(/bin/rpm -q --provides $(/bin/rpm -q --whatprovides kernel-devel-uname-r) | sed -ne 's,kernel-devel-uname-r = ,, p')
+%kernel_release %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel))
+%kernel_name    %(/bin/rpm -q --queryformat '%{RPMTAG_NAME}' $(/bin/rpm -q --whatprovides kernel))
+
+# this script calls all scripts in /usr/lib/rpm/brp-tizen.d
+%__os_install_post  \
+       /usr/lib/rpm/brp-compress \
+       /usr/lib/rpm/brp-tizen  \
+       %{!?disable_docs_package:/usr/lib/rpm/tizen/find-docs.sh %{buildroot}} \
+%{nil}
+
+# macro: %configure_kernel_source
+#
+#
+%configure_kernel_source() \
+       if test -d /usr/src/linux ; then \
+           pushd /usr/src/linux \
+           test -f .config || cp arch/%_arch/defconfig.default .config \
+           yes "" | make oldconfig \
+           make dep \
+           popd \
+       fi \
+       %nil
+
+%install_info(:-:) \
+    ALL_ARGS=(%{**}) \
+    NUM_ARGS=${#ALL_ARGS[@]} \
+    if test -x /sbin/install-info ; then \
+       if test -e "${ALL_ARGS[$((NUM_ARGS-1))]}" ; then \
+           /sbin/install-info "${ALL_ARGS[@]}" \
+       fi \
+    fi ; 
+
+%install_info_delete(:-:) \
+    ALL_ARGS=(%{**}) \
+    NUM_ARGS=${#ALL_ARGS[@]} \
+    if test -x /sbin/install-info ; then \
+       if ! test -e "${ALL_ARGS[$((NUM_ARGS-1))]}" ; then \
+           /sbin/install-info --quiet --delete "${ALL_ARGS[@]}" \
+       fi ; \
+    fi ; 
+
+# find-supplements.ksyms parses this macro directly out of the spec file:
+%supplements_kernel_module() \
+    %{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)}
+
+%do_profiling 1
+%cflags_profile_generate -fprofile-generate
+%cflags_profile_feedback -fprofile-use
+
+
+
+# Tizen
+#
+%configure \
+  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+  FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
+  ./configure --build=%{_build} --host=%{_host} \\\
+        --program-prefix=%{?_program_prefix} \\\
+        --prefix=%{_prefix} \\\
+        --exec-prefix=%{_exec_prefix} \\\
+        --bindir=%{_bindir} \\\
+        --sbindir=%{_sbindir} \\\
+        --sysconfdir=%{_sysconfdir} \\\
+        --datadir=%{_datadir} \\\
+        --includedir=%{_includedir} \\\
+        --libdir=%{_libdir} \\\
+        --libexecdir=%{_libexecdir} \\\
+        --localstatedir=%{_localstatedir} \\\
+        --sharedstatedir=%{_sharedstatedir} \\\
+        --mandir=%{_mandir} \\\
+        --infodir=%{_infodir}
+
+
+%reconfigure \
+  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+  FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
+  autoreconf -v --install --force || exit 1 \
+  ./configure --build=%{_build} --host=%{_host} \\\
+        --program-prefix=%{?_program_prefix} \\\
+        --prefix=%{_prefix} \\\
+        --exec-prefix=%{_exec_prefix} \\\
+        --bindir=%{_bindir} \\\
+        --sbindir=%{_sbindir} \\\
+        --sysconfdir=%{_sysconfdir} \\\
+        --datadir=%{_datadir} \\\
+        --includedir=%{_includedir} \\\
+        --libdir=%{_libdir} \\\
+        --libexecdir=%{_libexecdir} \\\
+        --localstatedir=%{_localstatedir} \\\
+        --sharedstatedir=%{_sharedstatedir} \\\
+        --mandir=%{_mandir} \\\
+        --infodir=%{_infodir}
+
+%autogen \
+  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+  FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
+  ./autogen.sh --build=%{_build} --host=%{_host} \\\
+        --program-prefix=%{?_program_prefix} \\\
+        --prefix=%{_prefix} \\\
+        --exec-prefix=%{_exec_prefix} \\\
+        --bindir=%{_bindir} \\\
+        --sbindir=%{_sbindir} \\\
+        --sysconfdir=%{_sysconfdir} \\\
+        --datadir=%{_datadir} \\\
+        --includedir=%{_includedir} \\\
+        --libdir=%{_libdir} \\\
+        --libexecdir=%{_libexecdir} \\\
+        --localstatedir=%{_localstatedir} \\\
+        --sharedstatedir=%{_sharedstatedir} \\\
+        --mandir=%{_mandir} \\\
+        --infodir=%{_infodir}
+
+
+%makeinstall \
+  %{__make} \\\
+        prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
+        exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \\\
+        bindir=%{?buildroot:%{buildroot}}%{_bindir} \\\
+        sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \\\
+        sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \\\
+        datadir=%{?buildroot:%{buildroot}}%{_datadir} \\\
+        includedir=%{?buildroot:%{buildroot}}%{_includedir} \\\
+        libdir=%{?buildroot:%{buildroot}}%{_libdir} \\\
+        libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \\\
+        localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \\\
+        sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \\\
+        mandir=%{?buildroot:%{buildroot}}%{_mandir} \\\
+        infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\
+  install
+
+
+%make_install \
+  %{__make} \\\
+        DESTDIR=%{?buildroot:%{buildroot}} \\\
+        INSTALL_ROOT=%{?buildroot:%{buildroot}} \\\
+  install  \
+  rm -f %{?buildroot:%{buildroot}}%{_infodir}/dir \
+  find %{?buildroot:%{buildroot}} -regex ".*\\.la$" | xargs rm -f -- \
+  %{!?keepstatic:find %{?buildroot:%{buildroot}} -regex ".*\\.a$" | xargs rm -f --}
+
+%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
+        && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
+        [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
+
+%lang_package(n:f:) \
+%package %{-n:-n %{-n*}-}locale \
+Summary: Translations and Locale for package %{name}\
+Group: System/Localization\
+Requires: %{-n:%{-n*}}%{!-n:%{name}} = %{version} \
+Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \
+BuildArch:  noarch \
+%description %{-n:-n %{-n*}-}locale\
+This package provides translations for package %{name}.\
+%files %{-n:-n %{-n*}-}locale -f %{-f:%{-f*}.lang} %{!-f:%{name}.lang}\
+%defattr(-,root,root,-)\
+%{nil}
+
+%docs_package \
+%package docs \
+Summary: Documentation for package %{name}\
+Group: Documentation\
+AutoReqProv: 0\
+%description docs\
+This package provides documentation for package %{name}.\
+%files docs -f documentation.list\
+%defattr(-,root,root,-)\
+%{nil}
+
+# Bad hack to set $LANG to C during all RPM builds
+%prep \
+%%prep\
+LANG=C\
+export LANG\
+unset DISPLAY\
+%{nil}
+
+%build %%build\
+LANG=C\
+export LANG\
+unset DISPLAY\
+CFLAGS="%optflags" ; export CFLAGS ; \
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
+LD_AS_NEEDED=1; export LD_AS_NEEDED ; \
+%{nil}
+
+%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
+%%install\
+LANG=C\
+export LANG\
+unset DISPLAY\
+rm -rf %{?buildroot:%{buildroot}} \
+mkdir -p %{?buildroot:%{buildroot}} \
+%{nil}
+
+
+%clean %%clean\
+rm -rf %{?buildroot:%{buildroot}} \
+%{nil}
+
+%find_lang      /usr/lib/rpm/find-lang.sh %{buildroot}
+%find_docs      /usr/lib/rpm/tizen/find-docs.sh %{buildroot}
+
+
+
+#==============================================================================
+# ---- default .desktop directories per the desktop-entry freedesktop.org spec
+
+%_desktopdir    %{_datadir}/applications
+
+#==============================================================================
+# ---- Generic auto req/prov filtering macros
+#
+# http://fedoraproject.org/wiki/PackagingDrafts/AutoProvidesAndRequiresFiltering
+
+# prevent anything matching from being scanned for provides
+%filter_provides_in(P) %{expand: \
+%global __filter_prov_cmd %{?__filter_prov_cmd} %{__grep} -v %{-P} '%*' | \
+}
+
+# prevent anything matching from being scanned for requires
+%filter_requires_in(P) %{expand: \
+%global __filter_req_cmd %{?__filter_req_cmd} %{__grep} -v %{-P} '%*' | \
+}
+
+# filter anything matching out of the provides stream
+%filter_from_provides() %{expand: \
+%global __filter_from_prov %{?__filter_from_prov} | %{__sed} -e '%*' \
+}
+
+# filter anything matching out of the requires stream
+%filter_from_requires() %{expand: \
+%global __filter_from_req %{?__filter_from_req} | %{__sed} -e '%*' \
+}
+
+# actually set up the filtering bits
+%filter_setup %{expand: \
+%global _use_internal_dependency_generator 0 \
+%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u \
+%global __find_provides /bin/sh -c "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \
+%global __find_requires /bin/sh -c "%{?__filter_req_cmd}  %{__deploop R} %{?__filter_from_req}" \
+}
+
+%remove_docs \
+  rm -rf %{?buildroot:%{buildroot}}%{_infodir} \
+  rm -rf %{?buildroot:%{buildroot}}%{_defaultdocdir} \
+  rm -rf %{?buildroot:%{buildroot}}%{_datadir}/doc/%{name} \
+  rm -rf %{?buildroot:%{buildroot}}%{_datadir}/doc/%{name}-%{version} \
+  rm -rf %{?buildroot:%{buildroot}}%{_datadir}/gtk-doc \
+  rm -rf %{?buildroot:%{buildroot}}%{_datadir}/doc \
+  rm -rf %{?buildroot:%{buildroot}}%{_datadir}/man \
+  find %{?buildroot:%{buildroot}} -regex ".*/man/man./.*\.[0-9]" | xargs rm -f -- \
+  find %{?buildroot:%{buildroot}} -regex ".*/man/../man./.*\.[0-9]" | xargs rm -f -- \
+  find %{?buildroot:%{buildroot}} -regex ".*/man/man./.*\.[0-9]pm" | xargs rm -f --
+
+
+%install_service() \
+mkdir -p %{buildroot}/%{_unitdir}/%{1} \
+ln -s ../%{2}  %{buildroot}/%{_unitdir}/%{1}/%{2}  \
+%{nil}
+
+
+%_fontsdir               %{_usr}/share/fonts
+%_ttfontsdir             %{_fontsdir}/truetype
+%_miscfontsdir           %{_fontsdir}/misc
+%_fontsconfdir           %{_sysconfdir}/fonts
+%_fontsconfddir          %{_fontsconfdir}/conf.d
+%_fontsconfavaildir      %{_datadir}/%{name}/conf.avail
+
+%devel_package \
+%package devel \
+Summary: Development files for package %{name}\
+Group: Development\
+%description devel\
+This package provides header files and other developer releated files for package %{name}.\
+%files devel \
+%{_includedir}/*\
+%{_libdir}/pkgconfig/*.pc\
+%{_libdir}/*.so\
+%{nil}
+
+%devel_desc This package contains all necessary include files and libraries needed \
+to develop applications that require %{name}.\
+%{nil}
+
diff --git a/packaging/rpm.changes b/packaging/rpm.changes
new file mode 100644 (file)
index 0000000..c654c5e
--- /dev/null
@@ -0,0 +1,102 @@
+* Wed Jan 29 2014 Patrick McCarty <patrick.mccarty@linux.intel.com> 940f59b
+- Add three new RPM macros to use in packages with build dependencies on a
+  platform's kernel and/or kernel-devel package. The macros are
+  '%kernel_devel_uname_r', '%kernel_release', and '%kernel_name'.
+
+* Fri Jan 17 2014 Mikko Ylinen <mikko.ylinen@intel.com> accepted/tizen/generic/20140106.135159@e9e247d
+- MSM: fix access type length and validation
+- Security plugin: change policy to advisory
+- Security plugin: adding support for l access type
+
+* Tue Dec 03 2013 Rusty Lynch <rusty.lynch@intel.com> accepted/tizen/20131115.212447@d460069
+- Security plugin: removing exec label restriction
+
+* Fri Nov 15 2013 Rusty Lynch <rusty.lynch@intel.com> accepted/tizen/20131108.201843@93d4902
+- Fix rpmlint error
+- PTREL-155: fix build python-rpm
+- armv7l:fix faulty line in rpmrc.in
+- msm: check libxml/{xmlreader,tree}.h
+- Security plugin: Removing definition of System domain from default device policy
+
+* Wed Sep 25 2013 Jacek Bukarewicz <j.bukarewicz@samsung.com> accepted/tizen/20130916.211819@a771cdf
+- Introduction of -locale and -docs subpackages. Moved package to another group
+- update changes
+
+* Mon Sep 16 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130913.024734@b487cf5
+- remove --target from %configure macros
+
+* Mon Sep 02 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130820.223822@6ebf41a
+- Security plugin: adding checking of return code for dbus policy verification
+
+* Wed Aug 21 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130820.223822@6ec9c11
+- Security plugin: small fixes
+- Security plugin: removing disable-dchecks option
+- update changes and release
+
+* Mon Aug 05 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130710.214747@675aeea
+- Security plugin: support for --root option
+- Security plugin: pkg_name allocation in conflict
+- Security plugin: allowing multiple domains definition
+- resetting manifest requested domain to floor
+- update changelog
+
+* Wed Jun 12 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130520.094313@a3c78e0
+- update macros from project conf
+- Security plugin: Adding configuration option --disable-dchecks
+- Security-plugin: Fix the null pointer comparison  possibility in msmXattrSupport
+- Set license using %license
+- Fix 32bit kernel builds by not using eu-strip
+- Cleaning up code identation
+- Fix the missing path prefix for Plugin init hook
+- Fixes to rpm security plugin  - stricter control over smack64exec label assigment  - strciter control over dbus interface labels
+- Add VCS tag into .src.rpm
+- add find-provides.ksyms
+
+* Fri Mar 29 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130322.180734@fcbf4ed
+- find-provides.ksyms added for kernel packages and symbols
+
+* Fri Mar 29 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130322.180734@fcbf4ed
+- init message test [Elena Reshetova]
+- Adding Isolated domain to policy [Elena Reshetova]
+- Changing smack load path [Elena Reshetova]
+
+* Fri Mar 22 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130318.200853@1a584da
+- Fixed package groups
+
+* Mon Mar 18 2013 Anas Nashif <anas.nashif@intel.com> accepted/trunk/20130309.052847@1a584da
+- Adding a new attribute tag to manifest [Elena Reshetova]
+
+* Mon Mar 04 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130207.030314@31fe202
+- Fixed package groups
+- add macro no_lang_C
+- update find-lang
+- Call ldconfig
+- Include %{VCS} in rpm -q --info output
+
+* Wed Feb 06 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130206.154747@e2d13a6
+- Call ldconfig
+
+* Wed Feb 06 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130203.005409@caedd28
+- Move libs back to main package
+
+* Sat Feb 02 2013 Anas Nashif <anas.nashif@intel.com> rpm-4.11.0-release@531803c
+- Update to 4.11.0.1
+
+* Tue Jan 29 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> accepted/trunk/20130119.012137@c917b46
+- Temporally making loading of a configured plugin optional [Elena Reshetova]
+
+* Thu Jan 17 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130117.002510@77a88bd
+- fixing error in cleanup if magic db can't be loaded [Elena Reshetova]
+
+* Wed Jan 16 2013 Anas Nashif <anas.nashif@intel.com> accepted/trunk/20130114.165627@8999b08
+- Enable security plugin/Smack
+
+* Mon Jan 14 2013 Anas Nashif <anas.nashif@intel.com> accepted/trunk/20121215.193208@ed3861a
+- Move build related files to rpm-build
+
+* Sat Dec 15 2012 Anas Nashif <anas.nashif@intel.com> submit/trunk/20121215.171010@735e3f1
+- cleanup macros
+
+* Sat Dec 15 2012 Anas Nashif <anas.nashif@intel.com> rpm-4.11.0-beta1@be4c7d8
+- Update to 4.11 beta1
+
diff --git a/packaging/rpm.manifest b/packaging/rpm.manifest
new file mode 100644 (file)
index 0000000..017d22d
--- /dev/null
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>
diff --git a/packaging/rpmconfigcheck b/packaging/rpmconfigcheck
new file mode 100644 (file)
index 0000000..97bba74
--- /dev/null
@@ -0,0 +1,80 @@
+#! /bin/bash
+# Copyright (c) 2002 SuSE GmbH Nuernberg, Germany.
+#
+# Author: Michael Schroeder <feedback@suse.de>
+#
+# /etc/init.d/rpmconfigcheck
+# /usr/sbin/rcrpmconfigcheck
+#
+# Script to scan for unresolved .rpmnew, .rpmorig, and .rpmsave files
+#
+### BEGIN INIT INFO
+# Provides: rpmconfigcheck
+# Required-Start: $remote_fs
+# Required-Stop: $null
+# Default-Start: 2 3 5
+# Default-Stop:
+# Description: rpm config file scan
+### END INIT INFO
+
+. /etc/rc.status
+
+# First reset status of this service
+rc_reset
+
+configcheckfile=/var/adm/rpmconfigcheck
+packages=/var/lib/rpm/Packages
+
+test -z "$1" && set start
+
+case "$1" in
+    start|restart|try-restart|reload|force-reload)
+       if test -s $packages -a \( ! -e $configcheckfile -o -s $configcheckfile -o ! $packages -ot $configcheckfile \) ; then
+           echo -n "Searching for unresolved configuration files"
+           if test ! -e $configcheckfile -o ! $packages -ot $configcheckfile ; then
+               test -e $configcheckfile && mv -f $configcheckfile $configcheckfile.old
+               rpm -qalc | sort | perl -lne '-e "$_.rpmnew" and print "$_.rpmnew"; -e "$_.rpmorig" and print "$_.rpmorig"; -e "$_.rpmsave" and print "$_.rpmsave"' > $configcheckfile
+           else
+               mv -f $configcheckfile $configcheckfile.old
+               while read l; do
+                   test -e $l && echo $l
+               done < $configcheckfile.old > $configcheckfile
+               true
+           fi
+           rc_status -v
+           if test -s $configcheckfile; then
+               echo "Please check the following files (see /var/adm/rpmconfigcheck):"
+               sed -e 's/^/    /' < $configcheckfile
+               touch $configcheckfile.old
+               cat $configcheckfile $configcheckfile.old | sort | uniq -d > $configcheckfile.dup
+               cat $configcheckfile $configcheckfile.dup | sort | uniq -u > $configcheckfile.new
+               if test -s $configcheckfile.new ; then
+                   (
+                   echo "----------------------------------------------------------------------"
+                   echo "----------------------------------------------------------------------"
+                   echo "rpmconfigcheck"
+                   date
+                   echo "----------------------------------------"
+                   echo "This is a warning message."
+                   echo "rpmconfigcheck has found the following new unresolved config files"
+                   echo "(all files are listed in /var/adm/rpmconfigcheck):"
+                   cat $configcheckfile.new
+                   echo "----------------------------------------"
+                   ) >> /var/log/update-messages
+               fi
+           fi
+           rm -f $configcheckfile.old $configcheckfile.dup $configcheckfile.new
+       fi
+       ;;
+    stop)
+       ;;
+    status)
+       rc_failed 4
+       rc_status -v
+       ;;
+     *)
+       echo "Usage: $0 {start}"
+       exit 1
+       ;;
+esac
+rc_exit
index a9bd347292820367c5d94a665f72d4be5ec7ccdd..67502dd3161d0bfc96b54e64e61a711befec6e8f 100644 (file)
@@ -7,10 +7,11 @@ EXTRA_DIST = rpm/__init__.py rpm/transaction.py
 
 AM_CPPFLAGS = -I$(top_builddir)/include/
 AM_CPPFLAGS += -I$(top_srcdir)/python
-AM_CPPFLAGS += @PYTHON_CFLAGS@
+AM_CPPFLAGS += @PYTHON_CFLAGS@ -DPYTHON_MODULENAME=\"@PYTHON_MODULENAME@\"
 
 pkgpyexec_LTLIBRARIES = _rpmmodule.la _rpmbmodule.la _rpmsmodule.la
 pkgpyexec_DATA = rpm/__init__.py rpm/transaction.py
+pkgpyexecdir = @pyexecdir@/@PYTHON_MODULENAME@
 
 _rpmmodule_la_LDFLAGS = -module -avoid-version -shared
 _rpmmodule_la_LIBADD = \
index 45af516377d7826db573db77a49607da2a520be9..6c2ff54f7570d2b35dd7da9ab479a195a898230a 100644 (file)
@@ -377,7 +377,7 @@ static PyObject *hdr_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
     if (obj == NULL) {
        h = headerNew();
     } else if (CAPSULE_CHECK(obj)) {
-       h = CAPSULE_EXTRACT(obj, "rpm._C_Header");
+       h = CAPSULE_EXTRACT(obj, PYTHON_MODULENAME"._C_Header");
        headerLink(h);
     } else if (hdrObject_Check(obj)) {
        h = headerCopy(((hdrObject*) obj)->h);
@@ -718,7 +718,7 @@ static char hdr_doc[] =
 
 PyTypeObject hdr_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.hdr",                      /* tp_name */
+       PYTHON_MODULENAME".hdr",        /* tp_name */
        sizeof(hdrObject),              /* tp_size */
        0,                              /* tp_itemsize */
        (destructor) hdr_dealloc,       /* tp_dealloc */
diff --git a/python/rpm/__init__.py b/python/rpm/__init__.py
deleted file mode 100644 (file)
index 54728bb..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-r"""RPM Module
-
-This module enables you to manipulate rpms and the rpm database.
-
-The rpm base module provides the main starting point for
-accessing RPM from Python. For most usage, call
-the TransactionSet method to get a transaction set (rpmts).
-
-For example:
-       import rpm
-       ts = rpm.TransactionSet()
-
-The transaction set will open the RPM database as needed, so
-in most cases, you do not need to explicitly open the
-database. The transaction set is the workhorse of RPM.
-
-You can open another RPM database, such as one that holds
-all packages for a given Linux distribution, to provide
-packages used to solve dependencies. To do this, use
-the following code:
-
-rpm.addMacro('_dbpath', '/path/to/alternate/database')
-solvets = rpm.TransactionSet()
-solvets.openDB()
-rpm.delMacro('_dbpath')
-
-# Open default database
-ts = rpm.TransactionSet()
-
-This code gives you access to two RPM databases through
-two transaction sets (rpmts): ts is a transaction set
-associated with the default RPM database and solvets
-is a transaction set tied to an alternate database, which
-is very useful for resolving dependencies.
-"""
-
-import warnings
-from rpm._rpm import *
-from rpm.transaction import *
-import rpm._rpm as _rpm
-_RPMVSF_NODIGESTS = _rpm._RPMVSF_NODIGESTS
-_RPMVSF_NOHEADER = _rpm._RPMVSF_NOHEADER
-_RPMVSF_NOPAYLOAD = _rpm._RPMVSF_NOPAYLOAD
-_RPMVSF_NOSIGNATURES = _rpm._RPMVSF_NOSIGNATURES
-
-__version__ = _rpm.__version__
-__version_info__ = tuple(__version__.split('.'))
-
-# try to import build bits but dont require it
-try:
-    from rpm._rpmb import *
-except ImportError:
-    pass
-
-# try to import signing bits but dont require it
-try:
-    from rpm._rpms import *
-except ImportError:
-    pass
-
-# backwards compatibility + give the same class both ways
-ts = TransactionSet
-
-
-def headerLoad(*args, **kwds):
-    """DEPRECATED! Use rpm.hdr() instead."""
-    warnings.warn("Use rpm.hdr() instead.", DeprecationWarning, stacklevel=2)
-    return hdr(*args, **kwds)
-
-
-def _doHeaderListFromFD(rpm_fd, retrofit):
-    hlist = []
-    while 1:
-        try:
-            h = hdr(rpm_fd)
-            if retrofit:
-                h.convert(HEADERCONV_RETROFIT_V3)
-            hlist.append(h)
-        except _rpm.error:
-            break
-
-    return hlist
-
-
-def readHeaderListFromFD(file_desc, retrofit=True):
-    if not isinstance(file_desc, fd):
-        file_desc = fd(file_desc)
-    return _doHeaderListFromFD(file_desc, retrofit)
-
-
-def readHeaderListFromFile(path, retrofit=True):
-    f = fd(path)
-    hlist = _doHeaderListFromFD(f, retrofit)
-    f.close()
-    return hlist
-
-
-def readHeaderFromFD(file_desc):
-    """Return (header, pos_before_hdr)"""
-    if not isinstance(file_desc, fd):
-        file_desc = fd(file_desc)
-    try:
-        offset = file_desc.tell()
-        h = hdr(file_desc)
-    except (_rpm.error, IOError):
-        offset = None
-        h = None
-
-    return (h, offset)
-
-
-def signalsCaught(siglist):
-    """Returns list of signals that were caught."""
-    caught = []
-    for sig in siglist:
-        if signalCaught(sig):
-            caught.append(sig)
-
-    return caught
-
-
-def dsSingle(TagN, N, EVR="", Flags=RPMSENSE_ANY):
-    """
-    Creates a single entry dependency set (ds)
-
-    dsSingle(RPMTAG_CONFLICTNAME, "rpm") corresponds to "Conflicts: rpm"
-    """
-    return ds((N, Flags, EVR), TagN)
diff --git a/python/rpm/__init__.py.in b/python/rpm/__init__.py.in
new file mode 100644 (file)
index 0000000..e2a7a87
--- /dev/null
@@ -0,0 +1,128 @@
+r"""RPM Module
+
+This module enables you to manipulate rpms and the rpm database.
+
+The rpm base module provides the main starting point for
+accessing RPM from Python. For most usage, call
+the TransactionSet method to get a transaction set (rpmts).
+
+For example:
+       import rpm
+       ts = rpm.TransactionSet()
+
+The transaction set will open the RPM database as needed, so
+in most cases, you do not need to explicitly open the
+database. The transaction set is the workhorse of RPM.
+
+You can open another RPM database, such as one that holds
+all packages for a given Linux distribution, to provide
+packages used to solve dependencies. To do this, use
+the following code:
+
+rpm.addMacro('_dbpath', '/path/to/alternate/database')
+solvets = rpm.TransactionSet()
+solvets.openDB()
+rpm.delMacro('_dbpath')
+
+# Open default database
+ts = rpm.TransactionSet()
+
+This code gives you access to two RPM databases through
+two transaction sets (rpmts): ts is a transaction set
+associated with the default RPM database and solvets
+is a transaction set tied to an alternate database, which
+is very useful for resolving dependencies.
+"""
+
+import warnings
+from @PYTHON_MODULENAME@._rpm import *
+from @PYTHON_MODULENAME@.transaction import *
+import @PYTHON_MODULENAME@._rpm as _rpm
+_RPMVSF_NODIGESTS = _rpm._RPMVSF_NODIGESTS
+_RPMVSF_NOHEADER = _rpm._RPMVSF_NOHEADER
+_RPMVSF_NOPAYLOAD = _rpm._RPMVSF_NOPAYLOAD
+_RPMVSF_NOSIGNATURES = _rpm._RPMVSF_NOSIGNATURES
+
+__version__ = _rpm.__version__
+__version_info__ = tuple(__version__.split('.'))
+
+# try to import build bits but dont require it
+try:
+    from @PYTHON_MODULENAME@._rpmb import *
+except ImportError:
+    pass
+
+# try to import signing bits but dont require it
+try:
+    from @PYTHON_MODULENAME@._rpms import *
+except ImportError:
+    pass
+
+# backwards compatibility + give the same class both ways
+ts = TransactionSet
+
+
+def headerLoad(*args, **kwds):
+    """DEPRECATED! Use rpm.hdr() instead."""
+    warnings.warn("Use rpm.hdr() instead.", DeprecationWarning, stacklevel=2)
+    return hdr(*args, **kwds)
+
+
+def _doHeaderListFromFD(rpm_fd, retrofit):
+    hlist = []
+    while 1:
+        try:
+            h = hdr(rpm_fd)
+            if retrofit:
+                h.convert(HEADERCONV_RETROFIT_V3)
+            hlist.append(h)
+        except _rpm.error:
+            break
+
+    return hlist
+
+
+def readHeaderListFromFD(file_desc, retrofit=True):
+    if not isinstance(file_desc, fd):
+        file_desc = fd(file_desc)
+    return _doHeaderListFromFD(file_desc, retrofit)
+
+
+def readHeaderListFromFile(path, retrofit=True):
+    f = fd(path)
+    hlist = _doHeaderListFromFD(f, retrofit)
+    f.close()
+    return hlist
+
+
+def readHeaderFromFD(file_desc):
+    """Return (header, pos_before_hdr)"""
+    if not isinstance(file_desc, fd):
+        file_desc = fd(file_desc)
+    try:
+        offset = file_desc.tell()
+        h = hdr(file_desc)
+    except (_rpm.error, IOError):
+        offset = None
+        h = None
+
+    return (h, offset)
+
+
+def signalsCaught(siglist):
+    """Returns list of signals that were caught."""
+    caught = []
+    for sig in siglist:
+        if signalCaught(sig):
+            caught.append(sig)
+
+    return caught
+
+
+def dsSingle(TagN, N, EVR="", Flags=RPMSENSE_ANY):
+    """
+    Creates a single entry dependency set (ds)
+
+    dsSingle(RPMTAG_CONFLICTNAME, "rpm") corresponds to "Conflicts: rpm"
+    """
+    return ds((N, Flags, EVR), TagN)
diff --git a/python/rpm/transaction.py b/python/rpm/transaction.py
deleted file mode 100644 (file)
index 675ecaf..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-from __future__ import with_statement
-
-import sys
-import rpm
-from rpm._rpm import ts as TransactionSetCore
-
-if sys.version_info[0] == 3:
-    _string_types = str,
-else:
-    _string_types = basestring,
-
-
-# TODO: migrate relevant documentation from C-side
-class TransactionSet(TransactionSetCore):
-    _probFilter = 0
-
-    def _wrapSetGet(self, attr, val):
-        oval = getattr(self, attr)
-        setattr(self, attr, val)
-        return oval
-
-    def setVSFlags(self, flags):
-        return self._wrapSetGet('_vsflags', flags)
-
-    def getVSFlags(self):
-        return self._vsflags
-
-    def setColor(self, color):
-        return self._wrapSetGet('_color', color)
-
-    def setPrefColor(self, color):
-        return self._wrapSetGet('_prefcolor', color)
-
-    def setFlags(self, flags):
-        return self._wrapSetGet('_flags', flags)
-
-    def setProbFilter(self, ignoreSet):
-        return self._wrapSetGet('_probFilter', ignoreSet)
-
-    def parseSpec(self, specfile):
-        import rpm._rpmb
-        return rpm._rpmb.spec(specfile)
-
-    def getKeys(self):
-        keys = []
-        for te in self:
-            keys.append(te.Key())
-        # Backwards compatibility goo - WTH does this return a *tuple* ?!
-        if not keys:
-            return None
-        else:
-            return tuple(keys)
-
-    def _f2hdr(self, item):
-        if isinstance(item, _string_types):
-            with open(item) as f:
-                header = self.hdrFromFdno(f)
-        elif isinstance(item, rpm.hdr):
-            header = item
-        else:
-            header = self.hdrFromFdno(item)
-        return header
-
-    def addInstall(self, item, key, how="u"):
-        header = self._f2hdr(item)
-
-        if how not in ['u', 'i']:
-            raise ValueError('how argument must be "u" or "i"')
-        upgrade = (how == "u")
-
-        if not TransactionSetCore.addInstall(self, header, key, upgrade):
-            raise rpm.error("adding package to transaction failed")
-
-    def addReinstall(self, item, key):
-        header = self._f2hdr(item)
-
-        if not TransactionSetCore.addReinstall(self, header, key):
-            raise rpm.error("adding package to transaction failed")
-
-    def addErase(self, item):
-        hdrs = []
-        if isinstance(item, rpm.hdr):
-            hdrs = [item]
-        elif isinstance(item, rpm.mi):
-            hdrs = item
-        elif isinstance(item, int):
-            hdrs = self.dbMatch(rpm.RPMDBI_PACKAGES, item)
-        elif isinstance(item, _string_types):
-            hdrs = self.dbMatch(rpm.RPMDBI_LABEL, item)
-        else:
-            raise TypeError("invalid type %s" % type(item))
-
-        for h in hdrs:
-            if not TransactionSetCore.addErase(self, h):
-                raise rpm.error("package not installed")
-
-        # garbage collection should take care but just in case...
-        if isinstance(hdrs, rpm.mi):
-            del hdrs
-
-    def run(self, callback, data):
-        rc = TransactionSetCore.run(self, callback, data, self._probFilter)
-
-        # crazy backwards compatibility goo: None for ok, list of problems
-        # if transaction didn't complete and empty list if it completed
-        # with errors
-        if rc == 0:
-            return None
-
-        res = []
-        if rc > 0:
-            for prob in self.problems():
-                item = ("%s" % prob, (prob.type, prob._str, prob._num))
-                res.append(item)
-        return res
-
-    def check(self, *args, **kwds):
-        TransactionSetCore.check(self, *args, **kwds)
-
-        # compatibility: munge problem strings into dependency tuples of doom
-        res = []
-        for p in self.problems():
-            # is it anything we need to care about?
-            if p.type == rpm.RPMPROB_CONFLICT:
-                sense = rpm.RPMDEP_SENSE_CONFLICTS
-            elif p.type == rpm.RPMPROB_REQUIRES:
-                sense = rpm.RPMDEP_SENSE_REQUIRES
-            else:
-                continue
-
-            # strip arch, split to name, version, release
-            nevr = p.altNEVR.rsplit('.', 1)[0]
-            n, v, r = nevr.rsplit('-', 2)
-
-            # extract the dependency information
-            needs = p._str.split()
-            needname = needs[0]
-            needflags = rpm.RPMSENSE_ANY
-            if len(needs) == 3:
-                needop = needs[1]
-                if '<' in needop:
-                    needflags |= rpm.RPMSENSE_LESS
-                if '=' in needop:
-                    needflags |= rpm.RPMSENSE_EQUAL
-                if '>' in needop:
-                    needflags |= rpm.RPMSENSE_GREATER
-                needver = needs[2]
-            else:
-                needver = ""
-
-            res.append(((n, v, r),
-                        (needname, needver), needflags, sense, p.key))
-
-        return res
-
-    def hdrCheck(self, blob):
-        res, msg = TransactionSetCore.hdrCheck(self, blob)
-        # generate backwards compatibly broken exceptions
-        if res == rpm.RPMRC_NOKEY:
-            raise rpm.error("public key not available")
-        elif res == rpm.RPMRC_NOTTRUSTED:
-            raise rpm.error("public key not trusted")
-        elif res != rpm.RPMRC_OK:
-            raise rpm.error(msg)
-
-    def hdrFromFdno(self, fd):
-        res, h = TransactionSetCore.hdrFromFdno(self, fd)
-        # generate backwards compatibly broken exceptions
-        if res == rpm.RPMRC_NOKEY:
-            raise rpm.error("public key not available")
-        elif res == rpm.RPMRC_NOTTRUSTED:
-            raise rpm.error("public key not trusted")
-        elif res != rpm.RPMRC_OK:
-            raise rpm.error("error reading package header")
-
-        return h
diff --git a/python/rpm/transaction.py.in b/python/rpm/transaction.py.in
new file mode 100644 (file)
index 0000000..6a4e7c8
--- /dev/null
@@ -0,0 +1,176 @@
+from __future__ import with_statement
+
+import sys
+import @PYTHON_MODULENAME@ as rpm
+from @PYTHON_MODULENAME@._rpm import ts as TransactionSetCore
+
+if sys.version_info[0] == 3:
+    _string_types = str,
+else:
+    _string_types = basestring,
+
+
+# TODO: migrate relevant documentation from C-side
+class TransactionSet(TransactionSetCore):
+    _probFilter = 0
+
+    def _wrapSetGet(self, attr, val):
+        oval = getattr(self, attr)
+        setattr(self, attr, val)
+        return oval
+
+    def setVSFlags(self, flags):
+        return self._wrapSetGet('_vsflags', flags)
+
+    def getVSFlags(self):
+        return self._vsflags
+
+    def setColor(self, color):
+        return self._wrapSetGet('_color', color)
+
+    def setPrefColor(self, color):
+        return self._wrapSetGet('_prefcolor', color)
+
+    def setFlags(self, flags):
+        return self._wrapSetGet('_flags', flags)
+
+    def setProbFilter(self, ignoreSet):
+        return self._wrapSetGet('_probFilter', ignoreSet)
+
+    def parseSpec(self, specfile):
+        import rpm._rpmb
+        return rpm._rpmb.spec(specfile)
+
+    def getKeys(self):
+        keys = []
+        for te in self:
+            keys.append(te.Key())
+        # Backwards compatibility goo - WTH does this return a *tuple* ?!
+        if not keys:
+            return None
+        else:
+            return tuple(keys)
+
+    def _f2hdr(self, item):
+        if isinstance(item, _string_types):
+            with open(item) as f:
+                header = self.hdrFromFdno(f)
+        elif isinstance(item, rpm.hdr):
+            header = item
+        else:
+            header = self.hdrFromFdno(item)
+        return header
+
+    def addInstall(self, item, key, how="u"):
+        header = self._f2hdr(item)
+
+        if how not in ['u', 'i']:
+            raise ValueError('how argument must be "u" or "i"')
+        upgrade = (how == "u")
+
+        if not TransactionSetCore.addInstall(self, header, key, upgrade):
+            raise rpm.error("adding package to transaction failed")
+
+    def addReinstall(self, item, key):
+        header = self._f2hdr(item)
+
+        if not TransactionSetCore.addReinstall(self, header, key):
+            raise rpm.error("adding package to transaction failed")
+
+    def addErase(self, item):
+        hdrs = []
+        if isinstance(item, rpm.hdr):
+            hdrs = [item]
+        elif isinstance(item, rpm.mi):
+            hdrs = item
+        elif isinstance(item, int):
+            hdrs = self.dbMatch(rpm.RPMDBI_PACKAGES, item)
+        elif isinstance(item, _string_types):
+            hdrs = self.dbMatch(rpm.RPMDBI_LABEL, item)
+        else:
+            raise TypeError("invalid type %s" % type(item))
+
+        for h in hdrs:
+            if not TransactionSetCore.addErase(self, h):
+                raise rpm.error("package not installed")
+
+        # garbage collection should take care but just in case...
+        if isinstance(hdrs, rpm.mi):
+            del hdrs
+
+    def run(self, callback, data):
+        rc = TransactionSetCore.run(self, callback, data, self._probFilter)
+
+        # crazy backwards compatibility goo: None for ok, list of problems
+        # if transaction didn't complete and empty list if it completed
+        # with errors
+        if rc == 0:
+            return None
+
+        res = []
+        if rc > 0:
+            for prob in self.problems():
+                item = ("%s" % prob, (prob.type, prob._str, prob._num))
+                res.append(item)
+        return res
+
+    def check(self, *args, **kwds):
+        TransactionSetCore.check(self, *args, **kwds)
+
+        # compatibility: munge problem strings into dependency tuples of doom
+        res = []
+        for p in self.problems():
+            # is it anything we need to care about?
+            if p.type == rpm.RPMPROB_CONFLICT:
+                sense = rpm.RPMDEP_SENSE_CONFLICTS
+            elif p.type == rpm.RPMPROB_REQUIRES:
+                sense = rpm.RPMDEP_SENSE_REQUIRES
+            else:
+                continue
+
+            # strip arch, split to name, version, release
+            nevr = p.altNEVR.rsplit('.', 1)[0]
+            n, v, r = nevr.rsplit('-', 2)
+
+            # extract the dependency information
+            needs = p._str.split()
+            needname = needs[0]
+            needflags = rpm.RPMSENSE_ANY
+            if len(needs) == 3:
+                needop = needs[1]
+                if '<' in needop:
+                    needflags |= rpm.RPMSENSE_LESS
+                if '=' in needop:
+                    needflags |= rpm.RPMSENSE_EQUAL
+                if '>' in needop:
+                    needflags |= rpm.RPMSENSE_GREATER
+                needver = needs[2]
+            else:
+                needver = ""
+
+            res.append(((n, v, r),
+                        (needname, needver), needflags, sense, p.key))
+
+        return res
+
+    def hdrCheck(self, blob):
+        res, msg = TransactionSetCore.hdrCheck(self, blob)
+        # generate backwards compatibly broken exceptions
+        if res == rpm.RPMRC_NOKEY:
+            raise rpm.error("public key not available")
+        elif res == rpm.RPMRC_NOTTRUSTED:
+            raise rpm.error("public key not trusted")
+        elif res != rpm.RPMRC_OK:
+            raise rpm.error(msg)
+
+    def hdrFromFdno(self, fd):
+        res, h = TransactionSetCore.hdrFromFdno(self, fd)
+        # generate backwards compatibly broken exceptions
+        if res == rpm.RPMRC_NOKEY:
+            raise rpm.error("public key not available")
+        elif res == rpm.RPMRC_NOTTRUSTED:
+            raise rpm.error("public key not trusted")
+        elif res != rpm.RPMRC_OK:
+            raise rpm.error("error reading package header")
+
+        return h
index 9eae9a2286b7ddf0a1a7e70187a55f764611e899..7874a252427bc0336cbbda4be735cc085b60e1cf 100644 (file)
@@ -339,7 +339,7 @@ static char rpmds_doc[] =
 
 PyTypeObject rpmds_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.ds",                       /* tp_name */
+       PYTHON_MODULENAME".ds",         /* tp_name */
        sizeof(rpmdsObject),            /* tp_basicsize */
        0,                              /* tp_itemsize */
        /* methods */
index 85fb0cd24714b24af1c1af746d225e58a9d8deff..8b69ecb82923827558177cc93925f11ecaf752ca 100644 (file)
@@ -350,7 +350,7 @@ static PyGetSetDef rpmfd_getseters[] = {
 
 PyTypeObject rpmfd_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.fd",                       /* tp_name */
+       PYTHON_MODULENAME".fd",         /* tp_name */
        sizeof(rpmfdObject),            /* tp_size */
        0,                              /* tp_itemsize */
        /* methods */
index a1a743a1dfa9b5ae336f994705481bc00a79164a..742919f5c212e2b57ff274d0fe76468a11299ee3 100644 (file)
@@ -362,7 +362,7 @@ static char rpmfi_doc[] =
 
 PyTypeObject rpmfi_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.fi",                       /* tp_name */
+       PYTHON_MODULENAME".fi",         /* tp_name */
        sizeof(rpmfiObject),            /* tp_basicsize */
        0,                              /* tp_itemsize */
        /* methods */
index 1807414793ce26300f262f09d65e53b1839bab2b..f096cbd22556fd250163a5af0995b02e45a5bd0e 100644 (file)
@@ -115,7 +115,7 @@ static char rpmii_doc[] =
 
 PyTypeObject rpmii_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.ii",                       /* tp_name */
+       PYTHON_MODULENAME".ii",         /* tp_name */
        sizeof(rpmiiObject),            /* tp_size */
        0,                              /* tp_itemsize */
        (destructor) rpmii_dealloc,     /* tp_dealloc */
index d5f131e42c0df89dee11bb2c770b28d05dc406ea..7df847db731f89eb90544ea2a1f398a273b4bba7 100644 (file)
@@ -52,7 +52,7 @@ static char rpmPubkey_doc[] = "";
 
 PyTypeObject rpmPubkey_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.pubkey",                   /* tp_name */
+       PYTHON_MODULENAME".pubkey",     /* tp_name */
        sizeof(rpmPubkeyObject),        /* tp_size */
        0,                              /* tp_itemsize */
        (destructor) rpmPubkey_dealloc,/* tp_dealloc */
@@ -133,7 +133,7 @@ static char rpmKeyring_doc[] =
 
 PyTypeObject rpmKeyring_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.keyring",                  /* tp_name */
+       PYTHON_MODULENAME".keyring",    /* tp_name */
        sizeof(rpmKeyringObject),       /* tp_size */
        0,                              /* tp_itemsize */
        (destructor) rpmKeyring_dealloc,/* tp_dealloc */
index 379cafb3868e8b323f2fc70cdb00acce1d126e31..6988f37d65b2a8c82bdbfea2824c39401bcce639 100644 (file)
@@ -201,7 +201,7 @@ static char rpmmi_doc[] =
 
 PyTypeObject rpmmi_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.mi",                       /* tp_name */
+       PYTHON_MODULENAME".mi",         /* tp_name */
        sizeof(rpmmiObject),            /* tp_size */
        0,                              /* tp_itemsize */
        (destructor) rpmmi_dealloc,     /* tp_dealloc */
index bdc899a608122dd6a6dd2734b12f9751fc00bf31..567a632e0a3c7b51ef52c150ba6e0b64950e82ca 100644 (file)
@@ -72,8 +72,8 @@ static void rpmprob_dealloc(rpmProblemObject *s)
 
 PyTypeObject rpmProblem_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.prob",                     /* tp_name */
-       sizeof(rpmProblemObject),               /* tp_basicsize */
+       PYTHON_MODULENAME".prob",       /* tp_name */
+       sizeof(rpmProblemObject),       /* tp_basicsize */
        0,                              /* tp_itemsize */
        /* methods */
        (destructor)rpmprob_dealloc,    /* tp_dealloc */
index 6936e757e11975114d865ccdec6771c5eb5c13ed..5c8be47c8f9cccdb03c47bfbc6fdea43342c8667 100644 (file)
@@ -204,7 +204,7 @@ rpmte_Files(rpmteObject * s, PyObject * args, PyObject * kwds)
 }
 static struct PyMethodDef rpmte_methods[] = {
     {"Type",   (PyCFunction)rpmte_TEType,      METH_NOARGS,
-     "te.Type() -- Return element type (rpm.TR_ADDED | rpm.TR_REMOVED).\n" },
+     "te.Type() -- Return element type ("PYTHON_MODULENAME".TR_ADDED | "PYTHON_MODULENAME".TR_REMOVED).\n" },
     {"N",      (PyCFunction)rpmte_N,           METH_NOARGS,
      "te.N() -- Return element name.\n" },
     {"E",      (PyCFunction)rpmte_E,           METH_NOARGS,
@@ -257,7 +257,7 @@ static char rpmte_doc[] =
 
 PyTypeObject rpmte_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.te",                       /* tp_name */
+       PYTHON_MODULENAME".te",         /* tp_name */
        sizeof(rpmteObject),            /* tp_size */
        0,                              /* tp_itemsize */
        (destructor)0,                  /* tp_dealloc */
index d56a09c22e7470d9fd64813405ab703c65322bc3..98e1c6642ea569c61722270565d89d7cc2bf3333 100644 (file)
@@ -459,7 +459,7 @@ static PyObject *rpmts_setKeyring(rpmtsObject *s, PyObject *arg)
     if (arg == Py_None || rpmKeyringFromPyObject(arg, &keyring)) {
        return PyBool_FromLong(rpmtsSetKeyring(s->ts, keyring) == 0);
     } else {
-       PyErr_SetString(PyExc_TypeError, "rpm.keyring or None expected");
+       PyErr_SetString(PyExc_TypeError, PYTHON_MODULENAME".keyring or None expected");
        return NULL;
     }
 }
@@ -968,7 +968,7 @@ static PyGetSetDef rpmts_getseters[] = {
 
 PyTypeObject rpmts_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.ts",                       /* tp_name */
+       PYTHON_MODULENAME".ts",         /* tp_name */
        sizeof(rpmtsObject),            /* tp_size */
        0,                              /* tp_itemsize */
        (destructor) rpmts_dealloc,     /* tp_dealloc */
index dd56a47a9ae05cd7297b852f1aa9838804ebb565..a43bb6d4d6d6efb51e7285f869c9d4895f6e7e82 100644 (file)
@@ -25,11 +25,11 @@ if os.access('Makefile.am', os.F_OK):
     os.environ['PKG_CONFIG_PATH'] = '..'
 
 
-rpmmod = Extension('rpm._rpm',
+rpmmod = Extension('@PYTHON_MODULENAME@._rpm',
                    sources = [  'header-py.c', 'rpmds-py.c', 'rpmfd-py.c',
                                'rpmfi-py.c', 'rpmii-py.c', 'rpmkeyring-py.c',
                                 'rpmmacro-py.c', 'rpmmi-py.c', 'rpmps-py.c',
-                                'rpmstrpool-py.c', 'rpmfiles-py.c', 
+                                'rpmstrpool-py.c', 'rpmfiles-py.c',
                                'rpmarchive-py.c', 'rpmtd-py.c',
                                 'rpmte-py.c', 'rpmts-py.c', 'rpmmodule.c',
                              ],
@@ -40,7 +40,7 @@ rpmmod = Extension('rpm._rpm',
                    extra_link_args = additional_link_args
                   )
 
-rpmbuild_mod = Extension('rpm._rpmb',
+rpmbuild_mod = Extension('@PYTHON_MODULENAME@._rpmb',
                    sources = ['rpmbmodule.c', 'spec-py.c'],
                    include_dirs = pkgconfig('--cflags'),
                    library_dirs = pkgconfig('--libs-only-L'),
@@ -49,7 +49,7 @@ rpmbuild_mod = Extension('rpm._rpmb',
                    extra_link_args = additional_link_args
                   )
 
-rpmsign_mod = Extension('rpm._rpms',
+rpmsign_mod = Extension('@PYTHON_MODULENAME@._rpms',
                    sources = ['rpmsmodule.c'],
                    include_dirs = pkgconfig('--cflags'),
                    library_dirs = pkgconfig('--libs-only-L'),
index 47c17400f2112d12c557881893494a2cd459a1b7..392ecc0044e59694b09333f44c29b74fde8f28b3 100644 (file)
 /* Header objects are in another module, some hoop jumping required... */
 static PyObject *makeHeader(Header h)
 {
-    PyObject *rpmmod = PyImport_ImportModuleNoBlock("rpm");
+    PyObject *rpmmod = PyImport_ImportModuleNoBlock(PYTHON_MODULENAME);
     if (rpmmod == NULL) return NULL;
 
-    PyObject *ptr = CAPSULE_BUILD(h, "rpm._C_Header");
+    PyObject *ptr = CAPSULE_BUILD(h, PYTHON_MODULENAME"._C_Header");
     PyObject *hdr = PyObject_CallMethod(rpmmod, "hdr", "(O)", ptr);
     Py_XDECREF(ptr);
     Py_XDECREF(rpmmod);
@@ -98,7 +98,7 @@ static PyGetSetDef specpkg_getseters[] = {
 
 PyTypeObject specPkg_Type = {
        PyVarObject_HEAD_INIT(&PyType_Type, 0)
-       "rpm.specpkg",                  /* tp_name */
+       PYTHON_MODULENAME".specpkg",    /* tp_name */
        sizeof(specPkgObject),          /* tp_size */
        0,                              /* tp_itemsize */
        (destructor) specPkg_dealloc,   /* tp_dealloc */
@@ -312,7 +312,7 @@ static struct PyMethodDef spec_methods[] = {
 
 PyTypeObject spec_Type = {
     PyVarObject_HEAD_INIT(&PyType_Type, 0)
-    "rpm.spec",               /*tp_name*/
+    PYTHON_MODULENAME".spec",  /*tp_name*/
     sizeof(specObject),        /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor) spec_dealloc, /*tp_dealloc*/
diff --git a/rpm.am b/rpm.am
index 1b9ef71cf09d4c69abe27f965695a49698f1cbf6..e4f2e3ce3b7d54b54aa4501392ad4aabd39ce4a6 100644 (file)
--- a/rpm.am
+++ b/rpm.am
@@ -6,4 +6,4 @@ rpmlibexecdir = @RPMCONFIGDIR@
 rpmconfigdir = @RPMCONFIGDIR@
 
 # Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 4:0:1
\ No newline at end of file
+rpm_version_info = 4:0:1