Add package for i686; fixed mem leak; use upx to compress files

Fixed #1 according to Xu Shaohua's fix
Senorsen · May 26, 2016 · c9b2c73 · c9b2c73
1 parent 9ce8db5
commit c9b2c73
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
-tmp/
-control
+tmp-x86_64/
+tmp-i686/
+dist/
diff --git a/build-all.sh b/build-all.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Author: Senorsen <senorsen.zhang@gmail.com>
+# https://github.com/Senorsen/netease-cloud-music-rpm
+#
+
+set -e
+set -x
+
+cd $(dirname $0)
+
+DEBFILE_64="netease-cloud-music_0.9.0_amd64.deb"
+DEBFILE_32="netease-cloud-music_0.9.0_i386.deb"
+VERSION=0.9.0
+RELEASE=3
+
+./build.sh $DEBFILE_64 $VERSION $RELEASE x86_64
+./build.sh $DEBFILE_32 $VERSION $RELEASE i686
diff --git a/build.sh b/build.sh
@@ -7,39 +7,48 @@
 set -e
 set -x
 
-DEBURL="http://s1.music.126.net/download/pc/netease-cloud-music_0.9.0_amd64.deb"
-DEBFILENAME="netease-cloud-music_0.9.0_amd64.deb"
-VERSION=0.9.0
-RELEASE=2
-ARCH="x86_64"
+DEBFILENAME="$1"
+DEBURL="http://s1.music.126.net/download/pc/${DEBFILENAME}"
+VERSION="$2"
+RELEASE="$3"
+ARCH="$4"
 NAME="netease-cloud-music"
 SEMIDIR="$NAME-$VERSION"
 FULLDIR="$SEMIDIR-$RELEASE.$ARCH"
 
 mkdir -p ~/rpmbuild/SOURCES
 cd $(dirname $0)
-rm -rf tmp
-mkdir -p tmp
-cd tmp
-cp -rv ../netease-cloud-music.spec ./
+rm -rf tmp-${ARCH}
+mkdir -p tmp-${ARCH}
+mkdir -p dist
+cd tmp-${ARCH}
+cp -rv ../netease-cloud-music.temp.spec ./netease-cloud-music.spec
+sed -i "s/\${VERSION}/${VERSION}/g" netease-cloud-music.spec
+sed -i "s/\${RELEASE}/${RELEASE}/g" netease-cloud-music.spec
+sed -i "s/\${ARCH}/${ARCH}/g" netease-cloud-music.spec
+sed -i "s/\${SOURCE}/${SEMIDIR}.tar.gz/g" netease-cloud-music.spec
+
 rm $DEBFILENAME -rf
 wget $DEBURL
 ar xf $DEBFILENAME
 tar xvf data.tar.xz
 mkdir -p $SEMIDIR
 mv usr $SEMIDIR/
+upx $SEMIDIR/usr/lib/netease-cloud-music/netease-cloud-music
+mkdir -p $SEMIDIR/usr/bin
+rm -rf $SEMIDIR/usr/bin/netease-cloud-music
+install -m 755 ../misc/netease-cloud-music $SEMIDIR/usr/bin/netease-cloud-music
 mkdir -p $SEMIDIR/etc/pki/rpm-gpg
 mkdir -p $SEMIDIR/etc/yum.repos.d
 mkdir -p $SEMIDIR/usr/share/senorsen
 wget https://dl-http.senorsen.com/pub/package/linux/senorsen.public.key -O senorsen.public.key
 wget https://dl-http.senorsen.com/pub/package/linux/senorsen.repo -O senorsen.repo
 install -m 644 senorsen.public.key $SEMIDIR/usr/share/senorsen/senorsen.public.key
 install -m 644 senorsen.repo $SEMIDIR/usr/share/senorsen/senorsen.repo
-wget https://dl-http.senorsen.com/2016/05/lib/libcrypto.so.1.0.0 -O $SEMIDIR/usr/lib/netease-cloud-music/libcrypto.so.1.0.2
-wget https://dl-http.senorsen.com/2016/05/lib/libssl.so.1.0.0 -O $SEMIDIR/usr/lib/netease-cloud-music/libssl.so.1.0.2
+wget https://dl-http.senorsen.com/2016/05/lib/libcrypto.so.1.0.0-${ARCH} -O $SEMIDIR/usr/lib/netease-cloud-music/libcrypto.so.1.0.2
 tar zcvf ${SEMIDIR}.tar.gz $SEMIDIR
 cp ${SEMIDIR}.tar.gz ~/rpmbuild/SOURCES
 mkdir -p ~/rpmbuild/SPECS
 cp netease-cloud-music.spec ~/rpmbuild/SPECS/
 fakeroot rpmbuild -ba netease-cloud-music.spec --target $ARCH
-cp ~/rpmbuild/RPMS/$ARCH/${FULLDIR}.rpm ./
+cp ~/rpmbuild/RPMS/$ARCH/${FULLDIR}.rpm ../dist/
diff --git a/misc/netease-cloud-music b/misc/netease-cloud-music
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /usr/lib/netease-cloud-music
+/usr/lib/netease-cloud-music/netease-cloud-music
diff --git a/netease-cloud-music.spec → netease-cloud-music.temp.spec b/netease-cloud-music.spec → netease-cloud-music.temp.spec
@@ -1,18 +1,54 @@
 %global debug_package %{nil}
 
 Name:		netease-cloud-music
-Version:	0.9.0
-Release:	2
+Version:	${VERSION}
+Release:	${RELEASE}
 Summary:	Netease Cloud Music (unofficial release, package made by Senorsen)
 
 Group:		Sound and Video
 License:	Proprietary
 URL:		https://github.com/Senorsen/netease-cloud-music-rpm
 
-Source: netease-cloud-music-0.9.0.tar.gz
+Source:	   ${SOURCE}
+
+AutoReqProv:	no
+
+Provides:	netease-cloud-music = ${VERSION}-${RELEASE}
+Provides:	application(netease-cloud-music.desktop)
+
+Requires:	alsa-lib%{?_isa} >= 1.0.16
+Requires:	atk%{?_isa} >= 1.12.4
+Requires:	glibc%{?_isa} >= 2.14
+Requires:	cairo%{?_isa} >= 1.6.0
+Requires:	libcue%{?_isa}
+Requires:	dbus%{?_isa} >= 1.2.14
+Requires:	expat%{?_isa} >= 2.0.1
+Requires:	fontconfig%{?_isa} >= 2.11
+Requires:	freetype%{?_isa} >= 2.6
+Requires:	libgcc%{?_isa}
+Requires:	gdk-pixbuf2%{?_isa} >= 2.22.0
+Requires:	glib2%{?_isa} >= 2.37.3
+Requires:	gtk2%{?_isa} >= 2.24.0
+Requires:	nspr%{?_isa}
+Requires:	nss%{?_isa}
+Requires:	pango%{?_isa}
+Requires:	qt5-qtbase%{?_isa}
+Requires:	qt5-qtmultimedia%{?_isa}
+Requires:	qt5-qtx11extras%{?_isa}
+Requires:	sqlite%{?_isa}
+Requires:	libstdc++%{?_isa}
+Requires:	taglib%{?_isa} >= 1.8
+Requires:	libXcursor%{?_isa}
+Requires:	libXext%{?_isa}
+Requires:	libXfixes%{?_isa}
+Requires:	libXi%{?_isa}
+Requires:	libXrandr%{?_isa}
+Requires:	libXrender%{?_isa}
+Requires:	libXScrnSaver%{?_isa}
+Requires:	libXtst%{?_isa}
+Requires:	zlib%{?_isa} >= 1.2.3
+Requires:	gstreamer1-plugins-ugly%{?_isa}
 
-AutoReqProv: no
-Requires:	alsa-lib >= 1.0.16, atk >= 1.12.4, glibc >= 2.14, cairo >= 1.6.0, libcue, dbus >= 1.2.14, expat >= 2.0.1, fontconfig >= 2.11, freetype >= 2.6, libgcc, gdk-pixbuf2 >= 2.22.0, glib2 >= 2.37.3, gtk2 >= 2.24.0, nspr, nss, pango, qt5-qtbase, qt5-qtmultimedia, qt5-qtx11extras, sqlite, openssl, libstdc++, taglib >= 1.8, libXcursor, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver, libXtst, zlib >= 1.2.3, gstreamer1-plugins-ugly
 
 %description
 Netease Cloud Music (unofficial release, package made by Senorsen <senorsen.zhang@gmail.com>)
@@ -29,8 +65,6 @@ echo $RPM_BUILD
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 mv ./* $RPM_BUILD_ROOT/
-rm -rf $RPM_BUILD_ROOT/usr/bin/netease-cloud-music
-ln -svf ../lib/netease-cloud-music/netease-cloud-music $RPM_BUILD_ROOT/usr/bin/netease-cloud-music
 
 %post
 gtk-update-icon-cache /usr/share/icons/hicolor
@@ -109,14 +143,15 @@ install -m 644 /usr/share/senorsen/senorsen.repo /etc/yum.repos.d/senorsen.repo
 /usr/lib/netease-cloud-music/libcef.so
 /usr/lib/netease-cloud-music/chrome-sandbox
 /usr/lib/netease-cloud-music/cef_200_percent.pak
-/usr/bin/netease-cloud-music
 /usr/lib/netease-cloud-music/libcrypto.so.1.0.2
-/usr/lib/netease-cloud-music/libssl.so.1.0.2
+/usr/bin/netease-cloud-music
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu May 26 2016 Senorsen <senorsen.zhang@gmail.com> - 0.9.0-3
+- Fix memory leak (according to issue #1, Xu Shaohua's fix)
 * Wed May 25 2016 Senorsen <senorsen.zhang@gmail.com> - 0.9.0-1
 - First rpm package! :-)