update initial spec files.
authorRonan Le Martret <ronan@fridu.net>
Fri, 16 May 2014 14:38:12 +0000 (16:38 +0200)
committerRonan Le Martret <ronan@fridu.net>
Fri, 16 May 2014 14:38:12 +0000 (16:38 +0200)
Change-Id: I060ac981752fee92c9c7368f6fe721d3a5f71359
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
proto-meta-Tizen_generic/specfile-initial/com-core/packaging/libcom-core.spec
proto-meta-Tizen_generic/specfile-initial/libiri/packaging/libiri.spec
proto-meta-Tizen_generic/specfile-initial/libtapi/packaging/libtapi.spec [deleted file]
proto-meta-Tizen_generic/specfile-initial/libtapi/packaging/libtapi3.spec [new file with mode: 0644]
proto-meta-Tizen_generic/specfile-initial/pwdutils/packaging/pwdutils.spec
proto-meta-Tizen_generic/specfile-initial/python-rpm/packaging/python-rpm.spec [deleted file]
proto-meta-Tizen_generic/specfile-initial/rpm/packaging/rpm.spec
proto-meta-Tizen_generic/specfile-initial/tizen-platform-config/packaging/tizen-platform-config.spec
proto-meta-Tizen_generic/specfile-initial/tizen-platform-wrapper/packaging/tizen-platform-wrapper.spec
proto-meta-Tizen_generic/specfile-initial/weston-common/packaging/weston-common.spec

index 8c1db7a..41bc5a8 100644 (file)
@@ -1,13 +1,13 @@
 Name:       libiri
-Version:       1.1
-Release:       1
-License:       BSD-3-Clause
-Summary:       An IRI parsing library
-Url:           http://code.google.com/p/libiri/
-Group:         System/Libraries
-Source:                %{name}-%{version}.tar.gz
+Version:    1.1
+Release:    0
+License:    BSD-3-Clause
+Summary:    An IRI parsing library
+Url:        http://code.google.com/p/libiri/
+Group:      System/Libraries
+Source:     %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
-BuildRequires: autoconf
+BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 
@@ -36,15 +36,13 @@ libiri is a simple toolkit for parsing Internationalized Resource Identifiers (I
 cp %{S:1001} .
 
 %build
-sh ./autogen.sh
-%configure
+%reconfigure
 make %{?_smp_mflags}
 
 %install
 %make_install
 
 
-
 %files
 %manifest %{name}.manifest
 %license LICENSE
diff --git a/proto-meta-Tizen_generic/specfile-initial/libtapi/packaging/libtapi.spec b/proto-meta-Tizen_generic/specfile-initial/libtapi/packaging/libtapi.spec
deleted file mode 100644 (file)
index 0c220c0..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-Name: libtapi
-Summary: Telephony dbus client library
-Version: 0.6.70
-Release:    2
-Group:      System/Libraries
-License:    Apache-2.0
-Source0:    libtapi-%{version}.tar.gz
-Source1001:    libtapi.manifest
-BuildRequires:  cmake
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(security-server)
-
-%description
-Telephony client API library
-
-%package devel
-Summary:    Telephony client API (devel)
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description devel
-Telephony client API library (devel)
-
-
-%prep
-%setup -q
-cp %{SOURCE1001} .
-
-
-%build
-%cmake .
-
-
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-%make_install
-
-rm -rf %{buildroot}/usr/include/telephony/tapi/.gitignore
-mkdir -p %{buildroot}/usr/share/license
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
-%files
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_libdir}/*.so.*
-/usr/share/license/libtapi
-
-%files devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_includedir}/telephony-client/*.h
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.so
diff --git a/proto-meta-Tizen_generic/specfile-initial/libtapi/packaging/libtapi3.spec b/proto-meta-Tizen_generic/specfile-initial/libtapi/packaging/libtapi3.spec
new file mode 100644 (file)
index 0000000..9b11e20
--- /dev/null
@@ -0,0 +1,60 @@
+%define major 3
+%define minor 0
+%define patchlevel 1
+
+Name:           libtapi3
+Version:    %{major}.%{minor}.%{patchlevel}
+Release:        1
+License:        Apache-2.0
+Summary:        Telephony client API library
+Group:          Telephony/Libraries
+Source0:        libtapi3-%{version}.tar.gz
+Source1001:     libtapi.manifest
+BuildRequires:  cmake
+BuildRequires:  python
+BuildRequires:  python-xml
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(security-server)
+
+%description
+Telephony client API library
+
+%package devel
+Summary:        Telephony client API (devel)
+Requires:       %{name} = %{version}
+
+%description devel
+Telephony client API library (devel)
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+%build
+%cmake . -DTAPI_VERSION=%{version}
+
+make %{?_smp_mflags}
+
+%install
+%make_install
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%manifest libtapi.manifest
+%license LICENSE
+%defattr(-,root,root,-)
+%{_libdir}/*.so*
+%{_bindir}/tapitest
+
+%files devel
+%manifest libtapi.manifest
+%defattr(-,root,root,-)
+%{_includedir}/tapi-3.0/*.h
+%{_includedir}/tapi-3.0/common/*.h
+%{_includedir}/tapi-3.0/private/*.h
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so
index 43678bb..aecc542 100644 (file)
@@ -11,7 +11,7 @@ License:        GPL-2.0
 Group:          Security/Accounts
 Source:         pwdutils-%{version}.tar.bz2
 Source3:        useradd.default
-Source1001:    pwdutils.manifest
+Source1001:     pwdutils.manifest
 
 %description
 This package includes the necessary programs for converting plain
@@ -27,22 +27,21 @@ cp %{SOURCE1001} .
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/pwdutils/lib*.so
-#mkdir $RPM_BUILD_ROOT/%{_lib}
-#mv $RPM_BUILD_ROOT%{_libdir}/security $RPM_BUILD_ROOT/%{_lib}
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/pwdutils/lib*.so
 /sbin/ldconfig -n %{_libdir}/pwdutils
-rm -f $RPM_BUILD_ROOT%{_libdir}/pwdutils/*a
-rm -f $RPM_BUILD_ROOT/%{_lib}/security/*a
 
-rm -f %{buildroot}/etc/init.d/rpasswdd
-rm -f %{buildroot}/etc/pam.d/rpasswd
-rm -f %{buildroot}/etc/rpasswd.conf
-rm -f %{buildroot}/usr/bin/rpasswd
-rm -f %{buildroot}/usr/sbin/rpasswdd
-ln -sf newgrp $RPM_BUILD_ROOT%{_bindir}/sg
-install -m 644 $RPM_SOURCE_DIR/useradd.default $RPM_BUILD_ROOT/etc/default/useradd
-echo ".so man8/useradd.8" > $RPM_BUILD_ROOT%{_mandir}/man8/adduser.8
+rm -f %{buildroot}%{_libdir}/pwdutils/*a
+rm -f %{buildroot}%{_lib}/security/*a
+rm -f %{buildroot}%{_sysconfdir}/init.d/rpasswdd
+rm -f %{buildroot}%{_sysconfdir}/pam.d/rpasswd
+rm -f %{buildroot}%{_sysconfdir}/rpasswd.conf
+rm -f %{buildroot}%{_bindir}/rpasswd
+rm -f %{buildroot}%{_sbindir}/rpasswdd
+
+ln -sf newgrp %{buildroot}%{_bindir}/sg
+install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/default/useradd
+echo ".so man8/useradd.8" > %{buildroot}%{_mandir}/man8/adduser.8
 
 %docs_package
 
@@ -50,17 +49,17 @@ echo ".so man8/useradd.8" > $RPM_BUILD_ROOT%{_mandir}/man8/adduser.8
 %manifest %{name}.manifest
 %license COPYING
 %defattr(-,root,root,755)
-%config /etc/login.defs
-%config /etc/pam.d/chage
-%config /etc/pam.d/chfn
-%config /etc/pam.d/chsh
-%config /etc/pam.d/passwd
-%config /etc/pam.d/shadow
-%config /etc/pam.d/useradd
-%config(noreplace) /etc/default/useradd
-%config(noreplace) /etc/default/passwd
-%dir /etc/pwdutils
-%config(noreplace) /etc/pwdutils/logging
+%config %{_sysconfdir}/login.defs
+%config %{_sysconfdir}/pam.d/chage
+%config %{_sysconfdir}/pam.d/chfn
+%config %{_sysconfdir}/pam.d/chsh
+%config %{_sysconfdir}/pam.d/passwd
+%config %{_sysconfdir}/pam.d/shadow
+%config %{_sysconfdir}/pam.d/useradd
+%config(noreplace) %{_sysconfdir}/default/useradd
+%config(noreplace) %{_sysconfdir}/default/passwd
+%dir %{_sysconfdir}/pwdutils
+%config(noreplace) %{_sysconfdir}/pwdutils/logging
 %attr (4755,root,shadow) %{_bindir}/chage
 %attr (4755,root,shadow) %{_bindir}/chfn
 %attr (4755,root,shadow) %{_bindir}/chsh
diff --git a/proto-meta-Tizen_generic/specfile-initial/python-rpm/packaging/python-rpm.spec b/proto-meta-Tizen_generic/specfile-initial/python-rpm/packaging/python-rpm.spec
deleted file mode 100644 (file)
index afd680a..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-Name:           python-rpm
-Version:        4.11.0.1
-Release:        0
-Summary:        Python Bindings for Manipulating RPM Packages
-License:        GPL-2.0+
-Group:          Base/Package Management
-Source99:       rpm.spec
-BuildRequires:  gettext-tools
-BuildRequires:  file-devel
-BuildRequires:  libacl-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  libcap-devel
-BuildRequires:  libelf-devel
-BuildRequires:  libtool
-BuildRequires:  lua-devel
-BuildRequires:  ncurses-devel
-BuildRequires:  popt-devel
-BuildRequires:  python-devel
-BuildRequires:  xz-devel
-BuildRequires:  zlib-devel
-BuildRequires:  nss-devel
-BuildRequires:  uthash-devel
-BuildRequires:  libxml2-devel
-BuildRequires:  libattr-devel
-BuildRequires:  pkgconfig(libsmack)
-Requires:       rpm = %{version}
-%{expand:%(sed -n -e '/^### SOURCES BEGIN ###/,/^### SOURCES END ###/p' <%_sourcedir/rpm.spec)}
-Source0:        rpm-%{version}.tar.bz2
-%global with_python 2
-
-%description
-The python-rpm package contains a module that permits applications
-written in the Python programming language to use the interface
-supplied by RPM Package Manager libraries.
-
-This package should be installed if you want to develop Python programs
-that will manipulate RPM packages and databases.
-
-%prep
-%setup -q -n rpm-%{version}
-%{expand:%(sed -n -e '/^### PREP BEGIN ###/,/^### PREP END ###/p' <%_sourcedir/rpm.spec)}
-
-%build
-%{expand:%(sed -n -e '/^### BUILD BEGIN ###/,/^### BUILD END ###/p' <%_sourcedir/rpm.spec)}
-
-%install
-mkdir -p %{buildroot}%{_prefix}/lib
-# only installing in python/ does not work because rpm links against
-# installed libs at install time
-%make_install
-find %{buildroot} -not -type d -and -not -path %{buildroot}%{_libdir}/python*/site-packages/rpm/\* -print0 | xargs -0 rm
-pushd %{buildroot}/%{_libdir}/python*/site-packages/rpm
-rm -f _rpmmodule.a _rpmmodule.la
-#python %{_libdir}/python*/py_compile.py *.py
-#python -O %{_libdir}/python*/py_compile.py *.py
-popd
-
-%files
-%defattr(-,root,root)
-%{_libdir}/python*/*/*
-
-%changelog
index 56f51b7..8ad49e8 100644 (file)
@@ -1,7 +1,8 @@
-%define rpmhome /usr/lib/rpm
+%define rpmlibdir %{_prefix}/lib
+%define rpmhome %{rpmlibdir}/rpm
 
 Name:           rpm
-Summary:        The RPM Package Manager
+Summary:        The Package Manager
 License:        GPL-2.0+
 Group:          Base/Package Management
 Version:        4.11.0.1
@@ -16,8 +17,9 @@ BuildRequires:  gettext-tools
 BuildRequires:  glibc-devel
 BuildRequires:  gzip
 BuildRequires:  libacl-devel
+BuildRequires:  libattr-devel
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  libcap-devel
+BuildRequires:  pkgconfig(libcap)
 BuildRequires:  libelf-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig(lua)
@@ -30,26 +32,21 @@ BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  uthash-devel
 BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  libattr-devel
 BuildRequires:  pkgconfig(libsmack)
-
+BuildRequires:  fdupes
 
 Provides:       rpminst
-Provides:          rpm-libs
-
-### SOURCES BEGIN ###
-Source1:               db-4.8.30.tar.bz2
-Source2:           db-4.8.30-integration.dif
-Source4:        rpm-tizen_macros
-Source8:        rpmconfigcheck
-Source13:          find-docs.sh
-Source22:          device-sec-policy
-Source23:       find-provides.ksyms
-Source1001:    rpm.manifest
-### SOURCES END ###
+Provides:       rpm-libs
+
+Source1:       db-4.8.30.tar.bz2
+Source2:       db-4.8.30-integration.dif
+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.bz2
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
 %define _binary_payload w9.bzdio
@@ -66,7 +63,7 @@ all installed packages.  RPM also supports database queries.
 %package devel
 Summary:        Include Files and Libraries mandatory for Development
 Requires:       rpm = %{version}
-Requires:       popt-devel
+Requires:       pkgconfig(popt)
 
 %description devel
 This package contains the RPM C library and header files.  These
@@ -78,7 +75,7 @@ need an intimate knowledge of RPM packages in order to function.
 %package build
 Summary:        Tools and Scripts to create rpm packages
 Requires:       rpm = %{version}
-Provides:       rpmbuild rpm:%_bindir/rpmbuild
+Provides:       rpmbuild rpm:%{_bindir}/rpmbuild
 Requires:       bzip2
 Requires:       xz
 Requires:       gzip
@@ -91,23 +88,33 @@ Requires:       glibc-devel
 
 %description build
 If you want to build a rpm, you need this package. It provides rpmbuild
-and requires some packages that are usually required 
+and requires some packages that are usually required
 
 %package security-plugin
 Summary: MSM security plugin for rpm
 Requires: rpm = %{version}-%{release}
 Requires: smack
-Requires: libxml2
 Requires: nss
 
 %description security-plugin
 This package contains the MSM security plugin for rpm that performs
-security-related functionality. 
+security-related functionality.
 
+%package -n python-rpm
+Summary: Python Bindings for Manipulating RPM Packages
+Requires:       rpm = %{version}
+BuildRequires:  pkgconfig(python)
+
+%description -n python-rpm
+The python-rpm package contains a module that permits applications
+written in the Python programming language to use the interface
+supplied by RPM Package Manager libraries.
+
+This package should be installed if you want to develop Python programs
+that will manipulate RPM packages and databases.
 
 %prep
 %setup -q -n rpm-%{version}
-### PREP BEGIN ###
 cp %{SOURCE1001} .
 rm -rf sqlite
 tar xjf %{S:1}
@@ -116,88 +123,85 @@ chmod -R u+w db/*
 # will get linked from db3
 rm -f rpmdb/db.h
 patch -p0 < %{S:2}
-
-if [ -s /etc/rpm/tizen_macros ]; then
-       cp -a /etc/rpm/tizen_macros %{SOURCE4}
+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
-### PREP END ###
 
 %build
-### BUILD BEGIN ###
 CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
-export CPPFLAGS 
+export CPPFLAGS
 export CFLAGS="%{optflags} -ffunction-sections"
-export LDFLAGS="-Wl,-Bsymbolic-functions -ffunction-sections"
+export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections"
 %ifarch armv5tel
 export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections"
 %endif
 
 %if %{_target_cpu}
+BUILDTARGET="--host=%{_target_cpu}-linux-gnu "
 %ifarch %arm
-BUILDTARGET="--build=%{_target_cpu}-tizen-linux-gnueabi"
+BUILDTARGET+="--build=%{_target_cpu}-tizen-linux-gnueabi "
 %else
-BUILDTARGET="--build=%{_target_cpu}-tizen-linux"
+BUILDTARGET+="--build=%{_target_cpu}-tizen-linux "
 %endif
 %endif
 
-autoreconf -i -f
-./configure --disable-dependency-tracking --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
---libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var  --with-lua \
---with-acl --with-cap  --enable-shared %{?with_python: --enable-python} --with-msm $BUILDTARGET
+%reconfigure \
+    --disable-dependency-tracking \
+    --with-lua \
+    --with-acl \
+    --with-cap \
+    --enable-shared \
+    --enable-python \
+    --with-msm \
+    $BUILDTARGET
 
 make %{?_smp_mflags}
-### BUILD END ###
 
 %install
-mkdir -p %{buildroot}/usr/lib
-mkdir -p %{buildroot}/usr/share/locale
-ln -s ../share/locale %{buildroot}/usr/lib/locale
+mkdir -p %{buildroot}%{rpmlibdir}
+mkdir -p %{buildroot}%{_datadir}/locale
+ln -s ../share/locale %{buildroot}%{rpmlibdir}/locale
 %make_install
-install -m 644 db3/db.h %{buildroot}/usr/include/rpm
-# remove .la file and the static variant of libpopt
-# have to remove the dependency from other .la files as well
-#for f in %{buildroot}/%{_libdir}/*.la; do
-#    sed -i -e "s,/%_lib/libpopt.la,-lpopt,g" $f
-#done
+install -m 644 db3/db.h %{buildroot}%{_includedir}/rpm
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cp -a tizen_macros %{buildroot}/usr/lib/rpm
-mkdir -p %{buildroot}/usr/lib/rpm/tizen
-install -m 755 %{SOURCE13} %{buildroot}/usr/lib/rpm/tizen
-install -m 755 %{SOURCE23} %{buildroot}/usr/lib/rpm
+cp -a tizen_macros %{buildroot}%{rpmhome}
+mkdir -p %{buildroot}%{rpmhome}/tizen
+install -m 755 %{SOURCE13} %{buildroot}%{rpmhome}/tizen
+install -m 755 %{SOURCE23} %{buildroot}%{rpmhome}
 install -m 644 %{SOURCE22} %{buildroot}%{_sysconfdir}/device-sec-policy
-install -m 644 %{SOURCE22} %{buildroot}%{_libdir}/rpm-plugins/msm-device-sec-policy
-ln -s ../tizen_macros %{buildroot}/usr/lib/rpm/tizen/macros
+install -m 644 %{SOURCE22} %{buildroot}%{__plugindir}/msm-device-sec-policy
+ln -s ../tizen_macros %{buildroot}%{rpmhome}/tizen/macros
 for d in BUILD RPMS SOURCES SPECS SRPMS BUILDROOT ; do
-  mkdir -p %{buildroot}/usr/src/packages/$d
-  chmod 755 %{buildroot}/usr/src/packages/$d
+  mkdir -p %{buildroot}%{_usrsrc}/packages/$d
+  chmod 755 %{buildroot}%{_usrsrc}/packages/$d
 done
-for d in %{buildroot}/usr/lib/rpm/platform/*-linux/macros ; do
+for d in %{buildroot}%{rpmhome}/platform/*-linux/macros ; do
   dd=${d%%-linux/macros}
   dd=${dd##*/}
-  mkdir %{buildroot}/usr/src/packages/RPMS/$dd
-  chmod 755 %{buildroot}/usr/src/packages/RPMS/$dd
+  mkdir -p %{buildroot}%{_usrsrc}/packages/RPMS/$dd
+  chmod 755 %{buildroot}%{_usrsrc}/packages/RPMS/$dd
 done
-mkdir -p %{buildroot}/var/lib/rpm
-gzip -9 %{buildroot}/%{_mandir}/man[18]/*.[18]
+mkdir -p %{buildroot}%{_localstatedir}/lib/rpm
+gzip -9 %{buildroot}%{_mandir}/man[18]/*.[18]
 export RPM_BUILD_ROOT
 chmod 755 doc/manual
 rm -rf doc/manual/Makefile*
-rm -f %{buildroot}/usr/lib/rpmpopt
+rm -f %{buildroot}%{rpmlibdir}/rpmpopt
 rm -rf %{buildroot}%{_mandir}/{fr,ja,ko,pl,ru,sk}
-rm -f %{buildroot}%{_prefix}/share/locale/de/LC_MESSAGES/rpm.mo
-rm -f %{buildroot}/usr/lib/rpm/cpanflute %{buildroot}/usr/lib/rpm/cpanflute2
-install -m 755 scripts/find-supplements{,.ksyms} %{buildroot}/usr/lib/rpm
-install -m 755 scripts/firmware.prov %{buildroot}/usr/lib/rpm
-install -m 755 scripts/debuginfo.prov %{buildroot}/usr/lib/rpm
-rm -f %{buildroot}/usr/lib/locale %{buildroot}/usr/lib/rpmrc
-mkdir -p %{buildroot}/etc/rpm
-chmod 755 %{buildroot}/etc/rpm
+rm -f %{buildroot}%{_datadir}/locale/de/LC_MESSAGES/rpm.mo
+rm -f %{buildroot}%{rpmhome}/cpanflute %{buildroot}%{rpmhome}/cpanflute2
+install -m 755 scripts/find-supplements{,.ksyms} %{buildroot}%{rpmhome}
+install -m 755 scripts/firmware.prov %{buildroot}%{rpmhome}
+install -m 755 scripts/debuginfo.prov %{buildroot}%{rpmhome}
+rm -f %{buildroot}%{rpmlibdir}/locale %{buildroot}%{rpmlibdir}/rpmrc
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+chmod 755 %{buildroot}%{_sysconfdir}/rpm
 mkdir -p %{buildroot}%{rpmhome}/macros.d
 # remove some nonsense or non-working scripts
-pushd %{buildroot}/usr/lib/rpm/
+pushd %{buildroot}%{rpmhome}/
 for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \
          magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \
          brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \
@@ -205,36 +209,43 @@ for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \
 do
     rm -f $f
 done
-for i in /usr/share/automake-*/*; do
+for i in %{_datadir}/automake-*/*; do
   if test -f "$i" && test -f "${i##*/}"; then
     rm -f "${i##*/}"
   fi
 done
 popd
-rm -rf %{buildroot}/%{_libdir}/python%{py_ver}
 rm -f %{buildroot}%{_libdir}/*.la
-rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la
-sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm
+rm -f %{buildroot}%{__plugindir}/*.la
+
+%fdupes %{buildroot}%{rpmhome}/platform
+
+sh %{buildroot}%{rpmhome}/find-lang.sh %{buildroot} rpm
+
 %ifarch armv7hl armv7l
-# rpm is using the host_cpu as default for the platform, but armv7hl is not known by the kernel.
+# rpm is using the host_cpu as default for the platform,
+#but armv7hl is not known by the kernel.
 # so we need to enforce the platform here.
-echo -n %{_target_cpu}-tizen-linux-gnueabi > %{buildroot}/etc/rpm/platform
+echo -n %{_target_cpu}-tizen-linux-gnueabi > %{buildroot}%{_sysconfdir}/rpm/platform
 %endif
 
 %post
 /sbin/ldconfig
-test -f var/lib/rpm/Packages || rpm --initdb
-rm -f var/lib/rpm/Filemd5s var/lib/rpm/Filedigests var/lib/rpm/Requireversion var/lib/rpm/Provideversion
+test -f %{_dbpath}/Packages || rpm --initdb
+rm -f %{_dbpath}/Filemd5s \
+      %{_dbpath}/Filedigests \
+      %{_dbpath}/Requireversion \
+      %{_dbpath}/Provideversion
 
-%postun 
+%postun
 /sbin/ldconfig
 
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root)
 %license COPYING
-       /etc/rpm
-       /bin/rpm
+%{_sysconfdir}/rpm
+/bin/rpm
 %{_bindir}/rpm2cpio
 %{_bindir}/rpmdb
 %{_bindir}/rpmkeys
@@ -251,21 +262,20 @@ rm -f var/lib/rpm/Filemd5s var/lib/rpm/Filedigests var/lib/rpm/Requireversion va
 %{rpmhome}/rpm.supp
 %{rpmhome}/tgpg
 %{rpmhome}/platform
-
-%dir   %{_libdir}/rpm-plugins
-       %{_libdir}/rpm-plugins/exec.so
-       %{_libdir}/librpm.so.*
-       %{_libdir}/librpmio.so.*
-    %{_libdir}/librpmbuild.so.*
-    %{_libdir}/librpmsign.so.*
-%dir   /var/lib/rpm
-%dir   %attr(755,root,root) /usr/src/packages/BUILD
-%dir   %attr(755,root,root) /usr/src/packages/SPECS
-%dir   %attr(755,root,root) /usr/src/packages/SOURCES
-%dir   %attr(755,root,root) /usr/src/packages/SRPMS
-%dir   %attr(755,root,root) /usr/src/packages/RPMS
-%dir   %attr(755,root,root) /usr/src/packages/BUILDROOT
-%dir   %attr(755,root,root) /usr/src/packages/RPMS/*
+%dir    %{__plugindir}
+%{__plugindir}/exec.so
+%{_libdir}/librpm.so.*
+%{_libdir}/librpmio.so.*
+%{_libdir}/librpmbuild.so.*
+%{_libdir}/librpmsign.so.*
+%dir    %{_localstatedir}/lib/rpm
+%dir    %attr(755,root,root) %{_usrsrc}/packages/BUILD
+%dir    %attr(755,root,root) %{_usrsrc}/packages/SPECS
+%dir    %attr(755,root,root) %{_usrsrc}/packages/SOURCES
+%dir    %attr(755,root,root) %{_usrsrc}/packages/SRPMS
+%dir    %attr(755,root,root) %{_usrsrc}/packages/RPMS
+%dir    %attr(755,root,root) %{_usrsrc}/packages/BUILDROOT
+%dir    %attr(755,root,root) %{_usrsrc}/packages/RPMS/*
 
 %files build
 %manifest %{name}.manifest
@@ -274,7 +284,6 @@ rm -f var/lib/rpm/Filemd5s var/lib/rpm/Filedigests var/lib/rpm/Requireversion va
 %{_bindir}/gendiff
 %{_bindir}/rpmspec
 %{_bindir}/rpmsign
-
 %{rpmhome}/tizen/find-*
 %{rpmhome}/brp-*
 %{rpmhome}/find-supplements*
@@ -291,27 +300,30 @@ rm -f var/lib/rpm/Filemd5s var/lib/rpm/Filedigests var/lib/rpm/Requireversion va
 %{rpmhome}/macros.*
 %{rpmhome}/fileattrs
 
-
 %files devel
 %manifest %{name}.manifest
 %defattr(644,root,root,755)
-%{_bindir}/rpmgraph
-/usr/include/rpm
-        %{_libdir}/librpm.so
-        %{_libdir}/librpmbuild.so
-        %{_libdir}/librpmio.so
-        %{_libdir}/librpmsign.so
-        %{_libdir}/pkgconfig/rpm.pc
+%attr(755,root,root) %{_bindir}/rpmgraph
+%{_includedir}/rpm
+%{_libdir}/librpm.so
+%{_libdir}/librpmbuild.so
+%{_libdir}/librpmio.so
+%{_libdir}/librpmsign.so
+%{_libdir}/pkgconfig/rpm.pc
 
 %files security-plugin
 %manifest %{name}.manifest
 %defattr(-,root,root)
-%{_libdir}/rpm-plugins/msm.so
-%{_libdir}/rpm-plugins/msm-device-sec-policy
+%{__plugindir}/msm.so
+%{__plugindir}/msm-device-sec-policy
 %config(noreplace) %{_sysconfdir}/device-sec-policy
 
+%files -n python-rpm
+%defattr(-,root,root)
+%{_libdir}/python*/site-packages/rpm
+%attr(755,root,root) %{_libdir}/python*/site-packages/rpm/transaction.py
+
 %lang_package
 
 %docs_package
-%doc   GROUPS
-
+%doc     GROUPS
index 5745a3e..d6dd2c3 100644 (file)
@@ -2,44 +2,45 @@
 
 Name:           tizen-platform-config
 Version:        1.0
-Release:        1
-Summary:               Tizen Platform Configuration 
-License:               MIT
+Release:        0
+Summary:        Tizen Platform Configuration
+License:        MIT
 Url:            http://www.tizen.org
 Group:          System/Configuration
 Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
-Source1001:            %{name}.manifest
-BuildRequires: tizen-platform-wrapper   
+Source1001:     %{name}.manifest
+BuildRequires:  tizen-platform-wrapper
 
-# the main package only contains a config file but other dependent packages 
-# will contain binary. So, we can't build a noarch package and have to avoid 
+# the main package only contains a config file but other dependent packages
+# will contain binary. So, we can't build a noarch package and have to avoid
 # a rpmlint warning using a filter in xxx-rpmlintrc
 
 %description
 Tizen Platform Configuration - variables definitions
 
 %package -n %{libname}
-Summary:               Tizen Platform Configuration - helper library
-Group:                 System/Libraries
+Summary:        Tizen Platform Configuration - helper library
+Group:          System/Libraries
 License:        LGPL-2.0
-Requires:              %{name} = %{version}
+Requires:       %{name} = %{version}
 %description -n %{libname}
 Tizen Platform Configuration - helper library to lookup Tizen variables easily
 
 %package -n %{libname}-devel
-Summary:               Tizen Platform Configuration - helper libray headers, RPM macros
-Group:                 Development/Libraries
+Summary:        Tizen Platform Configuration - helper libray headers, RPM macros
+Group:          Development/Libraries
 License:        LGPL-2.0
-Requires:              %{libname} = %{version}
+Requires:       %{libname} = %{version}
 %description -n %{libname}-devel
-Tizen Platform Configuration - helper library headers to include in source code, RPM macros to call in spec files
+Tizen Platform Configuration - helper library headers to include in source code,
+RPM macros to call in spec files
 
 %package -n %{name}-tools
-Summary:               Tizen Platform Configuration - tools
-Group:                 System/Utilities
+Summary:        Tizen Platform Configuration - tools
+Group:          System/Utilities
 License:        LGPL-2.0
-Requires:              %{libname} = %{version}
+Requires:       %{libname} = %{version}
 %description -n %{name}-tools
 Tizen Platform Configuration - helper program to lookup Tizen variables easily
 
@@ -48,13 +49,11 @@ Tizen Platform Configuration - helper program to lookup Tizen variables easily
 cp %{SOURCE1001} .
 
 %build
-%autogen \
-       --disable-static
-
-make %{?_smp_mflags}
+%reconfigure --disable-static
+%__make %{?_smp_mflags}
 
 %check
-make check
+%__make check
 
 %install
 %make_install
index ae84d2c..027a699 100644 (file)
@@ -2,12 +2,12 @@ Name:           tizen-platform-wrapper
 Version:        1.0
 Release:        0
 License:        LGPL-2.0
-Summary:               A toolkit to generate the libtizen-platform-config library
+Summary:        A toolkit to generate the libtizen-platform-config library
 Url:            http://www.tizen.org
 Group:          Development/Tools
 Source:         %{name}-%{version}.tar.bz2
-Source1001:            %{name}.manifest
-Requires:              gperf
+Source1001:     %{name}.manifest
+Requires:       gperf
 
 %description
 A toolkit to generate the libtizen-platform-config library in tizen-platform-config.
@@ -17,8 +17,8 @@ A toolkit to generate the libtizen-platform-config library in tizen-platform-con
 cp %{SOURCE1001} .
 
 %build
-%autogen
-make %{?_smp_mflags}
+%reconfigure
+%__make %{?_smp_mflags}
 
 %install
 %make_install
@@ -28,4 +28,5 @@ make %{?_smp_mflags}
 %license LGPL_2.0
 %{_bindir}/*
 %{_datadir}/%{name}/*
+%{_libdir}/pkgconfig/tizen-platform-wrapper.pc
 
index 34283b3..e90967c 100644 (file)
@@ -5,7 +5,6 @@ Release:    0
 Summary:    Tizen Common Weston configuration and set-up
 License:    MIT
 Group:      Base/Configuration
-#BuildArch:  noarch
 Source0:    %{name}-%{version}.tar.bz2
 Source1001: weston-common.manifest
 Provides:   weston-startup
@@ -16,7 +15,7 @@ Requires:   glibc
 # for useradd et al
 Requires:   pwdutils
 
-BuildRequires: autoconf >= 2.64, automake >= 1.11
+BuildRequires:  autoconf >= 2.64, automake >= 1.11
 BuildRequires:  libtool >= 2.2
 BuildRequires:  libjpeg-devel
 BuildRequires:  xz
@@ -64,7 +63,6 @@ compositor.
 cp %{SOURCE1001} .
 
 %build
-cd tz-launcher
 %reconfigure
 make %{?_smp_mflags}
 
@@ -73,9 +71,7 @@ make %{?_smp_mflags}
 %define daemon_group display
 
 #install tz-launcher
-cd tz-launcher
 %make_install
-cd ..
 
 # install weston service as 'display-manager.service' as it's the one wanted by graphical.target
 mkdir -p %{buildroot}%{_unitdir}