|
[-]
[+]
|
Changed |
maui-rpm-config.spec
|
|
|
|
[-]
[+]
|
Added |
0001-meego-rpm-config-0.18-merchanges.patch.patch
^
|
| @@ -0,0 +1,21 @@
+From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+Date: Sat, 27 Sep 2014 08:47:44 +0200
+Subject: meego-rpm-config-0.18-merchanges.patch
+
+---
+ rpmrc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rpmrc b/rpmrc
+index 7a893d5..774ad12 100644
+--- a/rpmrc
++++ b/rpmrc
+@@ -47,7 +47,7 @@ optflags: armv4tl %{__global_cflags} -march=armv4t
+ optflags: armv5tejl %{__global_cflags} -march=armv5te
+ Optflags: armv5tel %{__global_cflags} -fmessage-length=0 -march=armv5te -mlittle-endian
+ Optflags: armv6l %{__global_cflags} -fmessage-length=0 -march=armv6 -mlittle-endian -mfpu=vfp -mfloat-abi=softfp -D__SOFTFP__
+-Optflags: armv7l %{__global_cflags} -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=vfpv3 -mfloat-abi=softfp -D__SOFTFP__
++Optflags: armv7l %{__global_cflags} -fmessage-length=0 -march=armv7-a -mlittle-endian -mfpu=vfpv3-d16 -mfloat-abi=softfp -D__SOFTFP__
+ optflags: armv7hl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mno-thumb
+ optflags: armv7nhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -mno-thumb
+ optflags: armv7thl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb
|
|
[-]
[+]
|
Added |
0002-meego-rpm-config-0.18-bashism.patch.patch
^
|
| @@ -0,0 +1,39 @@
+From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+Date: Sat, 27 Sep 2014 08:47:44 +0200
+Subject: meego-rpm-config-0.18-bashism.patch
+
+---
+ macros | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/macros b/macros
+index 89a28cb..016c2f3 100644
+--- a/macros
++++ b/macros
+@@ -124,20 +124,18 @@
+
+
+ %install_info(:-:) \
+- ALL_ARGS=(%{**}) \
+- NUM_ARGS=${#ALL_ARGS[@]} \
++ lastarg() { shift $(($# - 1)) ; echo "$1" ; } \
+ if test -x sbin/install-info ; then \
+- if test -e "${ALL_ARGS[$((NUM_ARGS-1))]}" ; then \
+- sbin/install-info "${ALL_ARGS[@]}" \
++ if test -e "$(lastarg %{**})" ; then \
++ sbin/install-info %{**} \
+ fi \
+ fi ;
+
+ %install_info_delete(:-:) \
+- ALL_ARGS=(%{**}) \
+- NUM_ARGS=${#ALL_ARGS[@]} \
++ lastarg() { shift $(($# - 1)) ; echo "$1" ; } \
+ if test -x sbin/install-info ; then \
+- if ! test -e "${ALL_ARGS[$((NUM_ARGS-1))]}" ; then \
+- sbin/install-info --quiet --delete "${ALL_ARGS[@]}" \
++ if ! test -e "$(lastarg %{**})" ; then \
++ sbin/install-info --quiet --delete %{**} \
+ fi ; \
+ fi ;
+
|
|
[-]
[+]
|
Added |
0003-meego-rpm-config-0.18-flexible-install.patch.patch
^
|
| @@ -0,0 +1,35 @@
+From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+Date: Sat, 27 Sep 2014 08:47:44 +0200
+Subject: meego-rpm-config-0.18-flexible-install.patch
+
+---
+ macros | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/macros b/macros
+index 016c2f3..b4fc209 100644
+--- a/macros
++++ b/macros
+@@ -142,6 +142,13 @@
+ #==============================================================================
+ # ---- Build policy macros.
+ #
++
++%__spec_install_pre %{___build_pre}\
++ [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\
++ mkdir -p `dirname "$RPM_BUILD_ROOT"`\
++ mkdir "$RPM_BUILD_ROOT"\
++%{nil}
++
+ #---------------------------------------------------------------------
+ # Expanded at end of %install scriptlet.
+ #
+@@ -247,8 +254,6 @@ LD_AS_NEEDED=1; export LD_AS_NEEDED ; \
+ LANG=C\
+ export LANG\
+ unset DISPLAY\
+-rm -rf %{?buildroot:%{buildroot}} \
+-mkdir -p %{?buildroot:%{buildroot}} \
+ %{nil}
+
+ %check %%check\
|
|
[-]
[+]
|
Added |
0004-meego-rpm-config-xzdebuginfo.patch.patch
^
|
| @@ -0,0 +1,64 @@
+From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+Date: Sat, 27 Sep 2014 08:47:44 +0200
+Subject: meego-rpm-config-xzdebuginfo.patch
+
+---
+ macros | 38 +++++++-------------------------------
+ 1 file changed, 7 insertions(+), 31 deletions(-)
+
+diff --git a/macros b/macros
+index b4fc209..fc951bf 100644
+--- a/macros
++++ b/macros
+@@ -23,6 +23,13 @@
+ # Default fuzz level for %patch in spec file.
+ %_default_patch_fuzz 2
+
++%_source_filedigest_algorithm 8
++%_binary_filedigest_algorithm 8
++
++# Use XZ compression for binary payloads
++%_binary_payload w6.xzdio
++
++
+ #==============================================================================
+ # ---- configure and makeinstall.
+ #
+@@ -175,37 +182,6 @@
+ %{nil}
+
+
+-# Template for debug information sub-package.
+-# NOTE: This is a copy from rpm to get the ifnarch noarch fix, it can be removed later
+-%debug_package \
+-%ifnarch noarch\
+-%global __debug_package 1\
+-%package debuginfo \
+-Summary: Debug information for package %{name}\
+-Group: Development/Debug\
+-AutoReqProv: 0\
+-%description debuginfo\
+-This package provides debug information for package %{name}.\
+-Debug information is useful when developing applications that use this\
+-package or when debugging this package.\
+-%files debuginfo -f debugfiles.list\
+-%defattr(-,root,root,-)\
+-\
+-%package debugsource\
+-Summary: Debug sources for package %{name}\
+-Group: Development/Debug\
+-AutoReqProv: 0\
+-Requires: %{name}-debuginfo = %{version}-%{release}\
+-%description debugsource\
+-This package provides debug sources for package %{name}.\
+-Debug sources are useful when developing applications that use this\
+-package or when debugging this package.\
+-%files debugsource -f debugsources.list\
+-%defattr(-,root,root,-)\
+-%endif\
+-%{nil}
+-
+-
+ %lang_package \
+ %package locale \
+ Summary: Translations and Locale for package %{name}\
|
|
[-]
[+]
|
Added |
0005-meego-rpm-config-0.18-wnopsabi.patch.patch
^
|
| @@ -0,0 +1,31 @@
+From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+Date: Sat, 27 Sep 2014 08:47:44 +0200
+Subject: meego-rpm-config-0.18-wnopsabi.patch
+
+---
+ rpmrc | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/rpmrc b/rpmrc
+index 774ad12..29e7f83 100644
+--- a/rpmrc
++++ b/rpmrc
+@@ -46,12 +46,12 @@ optflags: armv4l %{__global_cflags} -fsigned-char -march=armv4
+ optflags: armv4tl %{__global_cflags} -march=armv4t
+ optflags: armv5tejl %{__global_cflags} -march=armv5te
+ Optflags: armv5tel %{__global_cflags} -fmessage-length=0 -march=armv5te -mlittle-endian
+-Optflags: armv6l %{__global_cflags} -fmessage-length=0 -march=armv6 -mlittle-endian -mfpu=vfp -mfloat-abi=softfp -D__SOFTFP__
+-Optflags: armv7l %{__global_cflags} -fmessage-length=0 -march=armv7-a -mlittle-endian -mfpu=vfpv3-d16 -mfloat-abi=softfp -D__SOFTFP__
+-optflags: armv7hl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mno-thumb
+-optflags: armv7nhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -mno-thumb
+-optflags: armv7thl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb
+-optflags: armv7tnhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -mthumb
++Optflags: armv6l %{__global_cflags} -fmessage-length=0 -march=armv6 -mlittle-endian -mfpu=vfp -mfloat-abi=softfp -D__SOFTFP__ -Wno-psabi
++Optflags: armv7l %{__global_cflags} -fmessage-length=0 -march=armv7-a -mlittle-endian -mfpu=vfpv3-d16 -mfloat-abi=softfp -D__SOFTFP__ -Wno-psabi
++optflags: armv7hl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mno-thumb -Wno-psabi
++optflags: armv7nhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -mno-thumb -Wno-psabi
++optflags: armv7thl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb -Wno-psabi
++optflags: armv7tnhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -mthumb -Wno-psabi
+
+
+ optflags: atarist %{__global_cflags}
|
|
[-]
[+]
|
Added |
0006-meego-rpm-config-0.18-replace-mno-thumb-with-marm.pa.patch
^
|
| @@ -0,0 +1,23 @@
+From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+Date: Sat, 27 Sep 2014 08:47:44 +0200
+Subject: meego-rpm-config-0.18-replace-mno-thumb-with-marm.patch
+
+---
+ rpmrc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rpmrc b/rpmrc
+index 29e7f83..39cf18d 100644
+--- a/rpmrc
++++ b/rpmrc
+@@ -48,8 +48,8 @@ optflags: armv5tejl %{__global_cflags} -march=armv5te
+ Optflags: armv5tel %{__global_cflags} -fmessage-length=0 -march=armv5te -mlittle-endian
+ Optflags: armv6l %{__global_cflags} -fmessage-length=0 -march=armv6 -mlittle-endian -mfpu=vfp -mfloat-abi=softfp -D__SOFTFP__ -Wno-psabi
+ Optflags: armv7l %{__global_cflags} -fmessage-length=0 -march=armv7-a -mlittle-endian -mfpu=vfpv3-d16 -mfloat-abi=softfp -D__SOFTFP__ -Wno-psabi
+-optflags: armv7hl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mno-thumb -Wno-psabi
+-optflags: armv7nhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -mno-thumb -Wno-psabi
++optflags: armv7hl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -marm -Wno-psabi
++optflags: armv7nhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -marm -Wno-psabi
+ optflags: armv7thl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb -Wno-psabi
+ optflags: armv7tnhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -mthumb -Wno-psabi
+
|
|
[-]
[+]
|
Added |
0007-Rename-to-maui.patch
^
|
| @@ -0,0 +1,364 @@
+From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+Date: Sat, 27 Sep 2014 08:49:17 +0200
+Subject: Rename to maui
+
+---
+ Makefile | 12 ++++++------
+ config.guess | 4 ++--
+ dist.sh | 14 +++++++-------
+ find-provides | 30 +++++++++++++++---------------
+ find-requires | 20 ++++++++++----------
+ find-requires.ksyms | 2 +-
+ macros | 30 +++++++++++++++---------------
+ meego-rpm-config.spec | 10 +++++-----
+ rpmrc | 2 +-
+ 9 files changed, 62 insertions(+), 62 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ac49aed..80a1ef7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-NAME=meego-rpm-config
++NAME=maui-rpm-config
+ VERSION = $(shell cat VERSION)
+ TAGVER = $(shell cat VERSION | sed -e "s/\([0-9\.]*\).*/\1/")
+
+@@ -14,16 +14,16 @@ clean:
+ rm -f *~
+
+ install:
+- mkdir -p $(DESTDIR)/usr/lib/rpm/meego
+- cp -pr * $(DESTDIR)/usr/lib/rpm/meego/
+- rm -f $(DESTDIR)/usr/lib/rpm/meego/Makefile
+- rm -f $(DESTDIR)/usr/lib/rpm/meego/meego-rpm-config.spec
++ mkdir -p $(DESTDIR)/usr/lib/rpm/maui
++ cp -pr * $(DESTDIR)/usr/lib/rpm/maui/
++ rm -f $(DESTDIR)/usr/lib/rpm/maui/Makefile
++ rm -f $(DESTDIR)/usr/lib/rpm/maui/maui-rpm-config.spec
+
+ tag-archive:
+ git tag -a $(VERSION)
+
+ create-archive:
+- git archive --format=tar --prefix=meego-rpm-config-$(VERSION)/ HEAD | bzip2 -9v > meego-rpm-config-$(VERSION).tar.bz2
++ git archive --format=tar --prefix=maui-rpm-config-$(VERSION)/ HEAD | bzip2 -9v > maui-rpm-config-$(VERSION).tar.bz2
+ @echo "The final archive is in $(NAME)-$(VERSION).tar.bz2"
+
+ archive: tag-archive create-archive
+diff --git a/config.guess b/config.guess
+index ba5314b..82bedbc 100755
+--- a/config.guess
++++ b/config.guess
+@@ -837,9 +837,9 @@ EOF
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep __ARM_EABI__ >/dev/null
+ then
+- echo ${UNAME_MACHINE}-meego-linux-gnu
++ echo ${UNAME_MACHINE}-maui-linux-gnu
+ else
+- echo ${UNAME_MACHINE}-meego-linux-gnueabi
++ echo ${UNAME_MACHINE}-maui-linux-gnueabi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+diff --git a/dist.sh b/dist.sh
+index 00c95b9..4d479d8 100755
+--- a/dist.sh
++++ b/dist.sh
+@@ -11,7 +11,7 @@
+ # If we successfully detect the version number, we output the
+ # dist tag. Otherwise, we exit with no output.
+
+-RELEASEFILE=/etc/meego-release
++RELEASEFILE=/etc/maui-release
+
+ function check_num {
+ MAINVER=`cut -d "(" -f 1 < $RELEASEFILE | \
+@@ -21,27 +21,27 @@ function check_num {
+ }
+
+
+-function check_meego {
+- grep -q MeeGo $RELEASEFILE && echo $DISTNUM
++function check_maui {
++ grep -q Maui $RELEASEFILE && echo $DISTNUM
+ }
+
+ DISTNUM=`check_num`
+-DISTMOB=`check_meego`
++DISTMOB=`check_maui`
+ if [ -n "$DISTNUM" ]; then
+ if [ -n "$DISTMOB" ]; then
+- DISTTYPE=meego
++ DISTTYPE=maui
+ fi
+ fi
+ [ -n "$DISTTYPE" -a -n "$DISTNUM" ] && DISTTAG=".${DISTTYPE}${DISTNUM}"
+
+ case "$1" in
+- --meego) echo -n "$DISTMOB" ;;
++ --maui) echo -n "$DISTMOB" ;;
+ --distnum) echo -n "$DISTNUM" ;;
+ --disttype) echo -n "$DISTTYPE" ;;
+ --help)
+ printf "Usage: $0 [OPTIONS]\n"
+ printf " Default mode is --dist. Possible options:\n"
+- printf " --meego\t\tfor MeeGo version\n"
++ printf " --maui\t\tfor Maui version\n"
+ printf " --dist\t\tfor distribution tag\n"
+ printf " --distnum\tfor distribution number (major)\n"
+ printf " --disttype\tfor distribution type\n" ;;
+diff --git a/find-provides b/find-provides
+index 7ef1951..6213848 100755
+--- a/find-provides
++++ b/find-provides
+@@ -53,27 +53,27 @@ done | sort -u
+
+ #
+ # --- Perl modules.
+-[ -x /usr/lib/rpm/meego/perl.prov ] &&
+- echo $filelist | tr '[:blank:]' \\n | grep '\.pm$' | /usr/lib/rpm/meego/perl.prov | sort -u
++[ -x /usr/lib/rpm/maui/perl.prov ] &&
++ echo $filelist | tr '[:blank:]' \\n | grep '\.pm$' | /usr/lib/rpm/maui/perl.prov | sort -u
+
+ #
+ # --- Python modules.
+-[ -x /usr/lib/rpm/meego/python.prov -a -n "$pythonlist" ] &&
+- echo $pythonlist | tr '[:blank:]' \\n | /usr/lib/rpm/meego/python.prov | sort -u
++[ -x /usr/lib/rpm/maui/python.prov -a -n "$pythonlist" ] &&
++ echo $pythonlist | tr '[:blank:]' \\n | /usr/lib/rpm/maui/python.prov | sort -u
+
+ #
+ # --- Tcl modules.
+-[ -x /usr/lib/rpm/meego/tcl.prov -a -n "$tcllist" ] &&
+- echo $tcllist | tr '[:blank:]' \\n | /usr/lib/rpm/meego/tcl.prov | sort -u
++[ -x /usr/lib/rpm/maui/tcl.prov -a -n "$tcllist" ] &&
++ echo $tcllist | tr '[:blank:]' \\n | /usr/lib/rpm/maui/tcl.prov | sort -u
+
+ #
+ # --- libtool
+-[ -x /usr/lib/rpm/meego/find-provides.libtool ] &&
+- echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/meego/find-provides.libtool | sort -u
++[ -x /usr/lib/rpm/maui/find-provides.libtool ] &&
++ echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/maui/find-provides.libtool | sort -u
+
+ #
+ # --- any other extra find-provides scripts
+-for i in /usr/lib/rpm/meego/find-provides.d/*.prov
++for i in /usr/lib/rpm/maui/find-provides.d/*.prov
+ do
+ [ -x $i ] &&
+ (echo $filelist | tr '[:blank:]' \\n | $i | sort -u)
+@@ -81,14 +81,14 @@ done
+
+ #
+ # --- debuginfo files
+-[ -x /usr/lib/rpm/meego/find-provides.debuginfo -a -n "$debuginfolist" ] &&
+- printf "%s\n" "${debuginfolist[@]}" | /usr/lib/rpm/meego/find-provides.debuginfo | sort -u
++[ -x /usr/lib/rpm/maui/find-provides.debuginfo -a -n "$debuginfolist" ] &&
++ printf "%s\n" "${debuginfolist[@]}" | /usr/lib/rpm/maui/find-provides.debuginfo | sort -u
+
+
+ #
+ # --- pkgconfig
+-[ -x /usr/lib/rpm/meego/find-provides.pkgconfig ] &&
+- echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/meego/find-provides.pkgconfig | sort -u
++[ -x /usr/lib/rpm/maui/find-provides.pkgconfig ] &&
++ echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/maui/find-provides.pkgconfig | sort -u
+
+ #
+ # --- Kernel module imported symbols
+@@ -113,7 +113,7 @@ then
+ unset is_kmod
+ fi
+
+-[ -x /usr/lib/rpm/meego/find-provides.ksyms ] && [ "$is_kmod" ] &&
+- printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/meego/find-provides.ksyms
++[ -x /usr/lib/rpm/maui/find-provides.ksyms ] && [ "$is_kmod" ] &&
++ printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/maui/find-provides.ksyms
+
+ exit 0
+diff --git a/find-requires b/find-requires
+index b1ac01b..d61a620 100755
+--- a/find-requires
++++ b/find-requires
+@@ -48,7 +48,7 @@ if [ "$needed" -eq 0 ]; then
+ lib64=`if file -L $f 2>/dev/null | \
+ grep "ELF 64-bit" >/dev/null; then echo "$mark64"; fi`
+ ldd $f | awk '/=>/ {
+- if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /libmeego-kernel.so/) {
++ if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /libmaui-kernel.so/) {
+ gsub(/'\''"/,"\\&",$1);
+ printf "%s'$lib64'\n", $1
+ }
+@@ -62,7 +62,7 @@ if [ "$needed" -eq 0 ]; then
+ lib64=`if file -L $f 2>/dev/null | \
+ grep "ELF 64-bit" >/dev/null; then echo "$mark64"; fi`
+ ldd $f | awk '/=>/ {
+- if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /libmeego-kernel.so/) {
|
