packages: java-skype4java/java-skype4java.spec - new maintainer, SWT depend...

[glen]

Author: glen                         Date: Sun Apr 15 22:01:23 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new maintainer, SWT dependency dropped, maven support
  http://www.gurucoder.org/skype-java-api-1-1-the-new-java-api-for-skype.html

---- Files affected:
packages/java-skype4java:
   java-skype4java.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/java-skype4java/java-skype4java.spec
diff -u packages/java-skype4java/java-skype4java.spec:1.2 packages/java-skype4java/java-skype4java.spec:1.3
--- packages/java-skype4java/java-skype4java.spec:1.2	Sun Apr 15 21:54:30 2012
+++ packages/java-skype4java/java-skype4java.spec	Mon Apr 16 00:01:17 2012
@@ -1,26 +1,31 @@
 # $Revision$, $Date$
+# TODO
+# - rename just to java-skype ?
+# - drop .jar extracing for shared lib, load it directly:
+#   src/main/java/com/skype/connector/ConnectorUtils.java (loadLibrary)
 %define		srcname		skype4java
 %include	/usr/lib/rpm/macros.java
 Summary:	Skype4Java - Skype API for Java
-Summary(pl.UTF-8):	-
 Name:		java-%{srcname}
-Version:	1.0
+Version:	1.3
 Release:	0.1
-License:	CPL v1.0
+License:	Apache v2.0, EPL v1.0
 Group:		Libraries/Java
-#Source0:	http://sourceforge.jp/frs/redir.php?m=iij&f=%2Fskype%2F21999%2Fskype_1.0.zip
-Source0:	http://iij.dl.sourceforge.jp/skype/21999/skype_%{version}.zip
-# Source0-md5:	16eaa53ec0c977bc49cd2d009cde42bf
-URL:		http://sourceforge.jp/projects/skype/
-BuildRequires:	eclipse-swt
+Source0:	https://github.com/taksan/skype-java-api/tarball/skype-java-api-%{version}/skype-java-api-%{version}.tgz
+# Source0-md5:	7358dc4381a7d594a7b799422810cdf5
+# http://mvnrepository.com/artifact/com.github.taksan/skype-java-api
+URL:		http://taksan.github.com/skype-java-api/
+#BuildRequires:	eclipse-swt
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.553
+BuildRequires:	java-commons-lang >= 2.1
+BuildRequires:	java-junit >= 3.8.2
 %if %(locale -a | grep -q '^en_US$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
 Requires:	jpackage-utils
-BuildArch:	noarch
+# Not noarch, because we compile only specific platform and arch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,39 +35,62 @@
 
 %prep
 %setup -qc
+mv taksan-skype-java-api-*/* .
 
-find -name '*.class' | xargs rm -v
-find -name '*.jar' | xargs rm -v
-find -name '*.dll' | xargs rm -v
-find -name '*.zip' | xargs rm -v
-
-find -name windows | xargs rm -vr
-find -name src_win | xargs rm -vr
+find -name '*.class' | xargs -r rm -v
+find -name '*.jar' | xargs -r rm -v
+find -name '*.dll' | xargs -r rm -v
+find -name '*.zip' | xargs -r rm -v
+find -name '*.so' | xargs -r rm -v
+find -name '*.jnilib' | xargs -r rm -v
+find -name 'Skype.Framework' | xargs -r rm -v
+
+find -name windows | xargs -r rm -vr
+find -name src_win32 | xargs -r rm -vr
+find -name win32 | xargs -r rm -vr
 find -name osx | xargs rm -vr
 find -name src_osx | xargs rm -vr
 
-# add empty dirs for build.xml
-install -d skype/lib/osx
-
 %build
-cd skype
-%ant
+export JAVA_HOME="%{java_home}"
+
+# compile classes
+mvn compile test-compile
+
+# native lib needs classes first
+%ifarch %{ix86}
+target=x86
+%endif
+%ifarch %{x8664}
+target=x64
+%endif
+%{__make} -C src-native/src_linux libskype_$target.so \
+	CC="%{__cc} %{rpmcppflags} %{rpmcflags} -fPIC" \
+	LINK="%{__cc}" \
+	LFLAGS="%{rpmldflags} -shared"
+
+# make final jar
+mvn package
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-# jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p skype/release/%{srcname}_linux.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
-ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
+cp -p target/skype-java-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+ln -s skype-java-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/skype-java-api.jar
+# old lib names
+ln -s skype-java-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s skype-java-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc README
 %{_javadir}/%{srcname}-%{version}.jar
 %{_javadir}/%{srcname}.jar
+%{_javadir}/skype-java-api-%{version}.jar
+%{_javadir}/skype-java-api.jar
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -70,6 +98,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/04/15 22:01:17  glen
+- new maintainer, SWT dependency dropped, maven support
+  http://www.gurucoder.org/skype-java-api-1-1-the-new-java-api-for-skype.html
+
 Revision 1.2  2012/04/15 19:54:30  glen
 - old changes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/java-skype4java/java-skype4java.spec?r1=1.2&r2=1.3