[gsettings-desktop-schemas-ubuntu] Update to version 3.6.1 with Ubunt…

…u version 3.6.0 and Ubuntu release 0ubuntu3
chenxiaolong · Nov 18, 2012 · f5a3b7d · f5a3b7d
1 parent fd68c0c
commit f5a3b7d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/gsettings-desktop-schemas-ubuntu/PKGBUILD b/gsettings-desktop-schemas-ubuntu/PKGBUILD
@@ -5,24 +5,26 @@
 
 pkgname=gsettings-desktop-schemas-ubuntu
 _ubuntu_rel=0ubuntu3
-pkgver=3.6.0.${_ubuntu_rel}
+_ubuntu_ver=3.6.0
+_actual_ver=3.6.1
+pkgver=${_actual_ver}.ubuntu${_ubuntu_ver}.${_ubuntu_rel}
 pkgrel=100
 pkgdesc="Shared GSettings schemas for the desktop"
 arch=('any')
 url="http://live.gnome.org/"
 license=('GPL')
 depends=('glib2')
 makedepends=('intltool' 'gobject-introspection')
-provides=("${pkgname%-*}=${pkgver%.*}")
+provides=("${pkgname%-*}=${_actual_ver}")
 conflicts=("${pkgname%-*}")
 install=${pkgname}.install
-source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname%-*}/${pkgver%.*.*}/${pkgname%-*}-${pkgver%.*}.tar.xz"
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname%-*}/${_actual_ver%.*}/${pkgname%-*}-${_actual_ver}.tar.xz"
-        "https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname%-*}_${pkgver%.*}-${_ubuntu_rel}.debian.tar.gz")
+        "https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname%-*}_${_ubuntu_ver}-${_ubuntu_rel}.debian.tar.gz")
-sha512sums=('e13d01abd25576b20d3290b24b231aa6cf53a320b96b399fc76752dff3b56d8b34124d0c2bd7591bc0954f7eea52e0aee599db7cadf48ef2646ae30549a5997f'
+sha512sums=('dc9d9173f4f89ece2f9b36748784d6832d28e73c5c90dabee3e7a4aa99a9f3e9f36986d85e64c9ddea8905d8de41fd5616b727b1a4b1818a30d37e66cf4ba9c4'
             '3e0195f29f760328418aabb0037c61ba057cfc5260588ed7bef27bacc7bcf34ed0b859c689dd47991c403ef96109b2f2dba8f02d6c3a1714caf02db50a2ac3d8')
 
 build() {
-  cd "${srcdir}/${pkgname%-*}-${pkgver%.*}"
+  cd "${srcdir}/${pkgname%-*}-${_actual_ver}"
 
   # Apply Ubuntu patches
   for i in $(cat "${srcdir}/debian/patches/series" | grep -v '#'); do
@@ -38,7 +40,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname%-*}-${pkgver%.*}"
+  cd "${srcdir}/${pkgname%-*}-${_actual_ver}"
 
   make DESTDIR="${pkgdir}" install
 }

diff --git a/gsettings-desktop-schemas-ubuntu/compare_versions.sh b/gsettings-desktop-schemas-ubuntu/compare_versions.sh
@@ -10,6 +10,6 @@ UPSTREAM_VER=$(wget -q "http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop
 
 echo ""
 
-echo -e "PKGBUILD version: ${pkgver%.*} ${_ubuntu_rel}"
+echo -e "PKGBUILD version: ${_actual_ver} Ubuntu ${_ubuntu_ver} ${_ubuntu_rel}"
 echo -e "Upstream version: ${UPSTREAM_VER}"
 echo -e "Ubuntu version:   ${UBUNTU_VER[@]}"