[meego-commits] 5264: Changes to Trunk/prelink

[Anas Nashif]

Hi,
I have made the following changes to prelink in project Trunk. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #5264:

  submit:   Trunk:Testing/prelink(r5) -> Trunk/prelink


Message:
    migrate from Testing after handset day1

State:   new          2010-06-30T14:59:25 nashif
Comment: None



changes files:
--------------
--- prelink.changes
+++ prelink.changes
@@ -0,0 +1,3 @@
+* Fri Jun 25 2010 Yan Yin <yan.yin at intel.com> - 0.4.2
+- Change to YAML format, manually fix %setup and SOURCE numbering in *.spec
+

new:
----
  Makefile
  prelink.yaml

spec files:
-----------
--- prelink.spec
+++ prelink.spec
@@ -1,50 +1,70 @@
-Summary: An ELF prelinking utility
+# 
+# Do not Edit! Generated by:
+# spectacle version 0.17
+# 
+# >> macros
+%define date 20100106
+# << macros
+
 Name: prelink
+Summary:    An ELF prelinking utility
 Version: 0.4.2
 Release: 2
-License: GPLv2+
 Group: System/Base
-%define date 20100106
-Source: http://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2
-Source2: prelink.conf
-Source3: prelink.cron
-Source4: prelink.sysconfig
-Buildroot: %{_tmppath}/prelink-root
-#BuildRequires: libelf-devel >= 0.7.0-5
+License:    GPLv2+
+Source0:    http://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2
+Source1:    prelink.conf
+Source2:    prelink.cron
+Source3:    prelink.sysconfig
+Source100:  prelink.yaml
+Requires:   glibc >= 2.2.4-18
+Requires:   coreutils
+Requires:   findutils
+Requires:   util-linux
+Requires:   gawk
+Requires:   grep
 BuildRequires: elfutils-libelf-devel-static
 BuildRequires: glibc-static
-Requires: glibc >= 2.2.4-18, coreutils, findutils
-Requires: util-linux, gawk, grep
-# For now
-ExclusiveArch: %{ix86} alpha sparc sparcv9 sparc64 s390 s390x x86_64 ppc ppc64
+
 
 %description
 The prelink package contains a utility which modifies ELF shared libraries
 and executables, so that far fewer relocations need to be resolved at runtime
 and thus programs come up faster.
 
+
+
+
 %prep
-%setup -q -n prelink
+%setup -q -n %{name}
+
+# >> setup
+# << setup
 
 %build
+# >> build pre
 sed -i -e '/^prelink_LDADD/s/$/ -lpthread/' src/Makefile.{am,in}
-%configure --disable-shared
-make %{_smp_mflags}
+# << build pre
 
+%configure --disable-static \
+    --disable-shared
 
-%check
-#echo ====================TESTING=========================
-#make -C testsuite check-harder
-#make -C testsuite check-cycle
-#echo ====================TESTING END=====================
+make %{?jobs:-j%jobs}
 
+# >> build post
+# << build post
 %install
-%{makeinstall}
+rm -rf %{buildroot}
+# >> install pre
+# << install pre
+%make_install
+
+# >> install post
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cp -a %{SOURCE2} %{buildroot}%{_sysconfdir}
+cp -a %{SOURCE1} %{buildroot}%{_sysconfdir}
 mkdir -p %{buildroot}%{_sysconfdir}/{sysconfig,cron.daily,prelink.conf.d}
-cp -a %{SOURCE3} %{buildroot}%{_sysconfdir}/cron.daily/prelink
-cp -a %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/prelink
+cp -a %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/prelink
+cp -a %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/prelink
 chmod 755 %{buildroot}%{_sysconfdir}/cron.daily/prelink
 chmod 644 %{buildroot}%{_sysconfdir}/{sysconfig/prelink,prelink.conf}
 cat > %{buildroot}%{_sysconfdir}/rpm/macros.prelink <<"EOF"
@@ -62,14 +82,27 @@
 touch %{buildroot}/var/lib/misc/prelink.force
 touch %{buildroot}/var/log/prelink/prelink.log
 
+# << install post
+%check
+# >> check
+#echo ====================TESTING=========================
+#make -C testsuite check-harder
+#make -C testsuite check-cycle
+#echo ====================TESTING END=====================
+# << check
+
+
+
 %post
+# >> post
 touch /var/lib/misc/prelink.force
+# << post
+
 
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+# >> files
 %doc doc/prelink.pdf
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/prelink.conf
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/sysconfig/prelink
@@ -85,4 +118,6 @@
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/misc/prelink.force
 %dir /var/log/prelink
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
+# << files
+
 

other changes:
--------------

++++++ Makefile (new)
--- Makefile
+++ Makefile
+PKG_NAME := prelink
+SPECFILE = $(addsuffix .spec, $(PKG_NAME))
+YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
+
+include /usr/share/packaging-tools/Makefile.common
+

++++++ prelink.yaml (new)
--- prelink.yaml
+++ prelink.yaml
+Name: prelink
+Summary: An ELF prelinking utility
+Version: 0.4.2
+Release: 2
+Group: System/Base
+License: GPLv2+
+Sources:
+    - http://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2
+    - prelink.conf
+    - prelink.cron
+    - prelink.sysconfig
+Description: |
+    The prelink package contains a utility which modifies ELF shared libraries
+    and executables, so that far fewer relocations need to be resolved at runtime
+    and thus programs come up faster.
+
+Requires:
+    - glibc >= 2.2.4-18
+    - coreutils
+    - findutils
+    - util-linux
+    - gawk
+    - grep
+PkgBR:
+    - elfutils-libelf-devel-static
+    - glibc-static
+Configure: configure
+ConfigOptions:
+    - --disable-shared
+Builder: make
+Check: yes