diff options
| -rw-r--r-- | gnome-extra/cinnamon/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/Manifest | 10 | ||||
| -rw-r--r-- | gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild | 6 |
3 files changed, 15 insertions, 8 deletions
diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog index 8f40b53c58d0..3df49e129b7f 100644 --- a/gnome-extra/cinnamon/ChangeLog +++ b/gnome-extra/cinnamon/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/cinnamon # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.4 2012/01/27 21:54:26 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.5 2012/01/30 22:33:08 tetromino Exp $ + + 30 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + cinnamon-1.2-r1.ebuild: + Fix building on x86 (bug #401223, thanks to Adrian Bassett and Lucian + Muresan). *cinnamon-1.2-r1 (27 Jan 2012) diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index d84d8e064d41..b7a9250bba6d 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -9,13 +9,13 @@ DIST cinnamon-1.1.3.tar.gz 2273742 RMD160 37f6cc48c6c46c69c8da16c647af3675ee3c03 DIST cinnamon-1.2.tar.gz 2375269 RMD160 66844177f0b9a331c2bf59434ffbfa39504f4854 SHA1 bdf91cef0e01ccbdf4d1b4e35c0f51ad04adacbd SHA256 caa83d0536bc08e2446277bb744efdf141b40cf705f4cf86ffbb91dea5d6d488 DIST cinnamon-session_1.0.0_all.deb 1634 RMD160 3420dd6144fe184cd0b049f9a7dc0b033b3cdb5a SHA1 f963e4473dbdb28964357f742119cf1c87c3361f SHA256 720e07da6f3163346db9d01fff1b8771aaf145c2d406a4e88435826a38de0134 EBUILD cinnamon-1.1.3.ebuild 6846 RMD160 fb2e31f780a44a9779d6dee4f35153e84396a422 SHA1 07053855f3798253d0f0d0ad55e791956b85b655 SHA256 e5e5b3a7fe436d5e0758606ca35a5ccf44b80492b9e854f1b58c0bce61f0b9c2 -EBUILD cinnamon-1.2-r1.ebuild 7525 RMD160 c0c9fd5373c641004d8135c2d5c43a87f3b81139 SHA1 d9a8aa94d097726f24c9d3fb261d10380cc730d9 SHA256 c851b55af494c7578e086177fd11c52eb00a1dfc708c8b959856f43bdb932fa9 -MISC ChangeLog 1375 RMD160 0fd5605cde3d2c48849c97ebda1bc2a550ed7895 SHA1 b0e711d7eb07f088a488dbbb795fbcbd07d6d7b2 SHA256 2c7eefc3e73263aa62ee3dc2ebc01ffd67cfc11bf41e1315f3ad08965097035d +EBUILD cinnamon-1.2-r1.ebuild 7571 RMD160 a27396186c6cff550637ad8089eb33056679f815 SHA1 ba7f1846054b8125fa72d912c49d4accb9d2d749 SHA256 92f48b81ac70308457477716eccd9ac511848aa19196dfa1da8a5e129ac4e633 +MISC ChangeLog 1545 RMD160 b9887b2bcfdcebcb6d349aae96c361589c973af6 SHA1 7cb6cf51aa8f4c12ec180f4395734df4d7af5918 SHA256 d72707d4f317b5386ce65c72b28f1104c73b9169377bd6faade699fa339f9c90 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk8jHRgACgkQdjK8w9WeBnC1vQD/Rjc2PFHDjJs++6hrq+QCqqUH -pvAqlRM+L4e/r4+Lmd0BAIqY1nP4gjYx6PfIhB+0QFC8d0O/HYQ0sC1yEQUEMpvq -=hC+v +iF4EAREIAAYFAk8nGqkACgkQdjK8w9WeBnAW8AD+LfeCs3yXxhdC2MwzkFbSTNT+ +su2SmBOmsbvtsJDiHrAA/jbfsrsX+Fb4wtrab477wds44hWgJUIkCt/qiwvLYT0M +=bhIG -----END PGP SIGNATURE----- diff --git a/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild b/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild index 0679be78139d..d83e7745c95a 100644 --- a/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild +++ b/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v 1.1 2012/01/27 21:54:26 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v 1.2 2012/01/30 22:33:08 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -142,7 +142,9 @@ src_prepare() { files/usr/bin/cinnamon-settings \ files/cinnamon-settings.pot \ files/makepot || die "sed 2 failed" - mv files/usr/lib files/usr/$(get_libdir) || die "mv failed" + if [[ "$(get_libdir)" != lib ]]; then + mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed" + fi eautoreconf gnome2_src_prepare |