[Jpackage-commits] dist/trilead-ssh2/JPP-6 trilead-ssh2.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Mon Jul 13 21:16:34 CEST 2009


Update of /home/projects/jpackage/cvs/dist/trilead-ssh2/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv13897

Modified Files:
	trilead-ssh2.spec 
Log Message:
- release

Index: trilead-ssh2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/trilead-ssh2/JPP-6/trilead-ssh2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** trilead-ssh2.spec	13 Jul 2009 19:06:28 -0000	1.1
--- trilead-ssh2.spec	13 Jul 2009 19:16:32 -0000	1.2
***************
*** 1,5 ****
  Name:           trilead-ssh2
  Version:        213
! Release:        %mkrel 2.0.1
  Epoch:          0
  Summary:        SSH-2 protocol implementation in pure Java
--- 1,5 ----
  Name:           trilead-ssh2
  Version:        213
! Release:        3%{?dist}
  Epoch:          0
  Summary:        SSH-2 protocol implementation in pure Java
***************
*** 8,14 ****
  URL:            http://www.trilead.com/Products/Trilead-SSH-2-Java/
  Source0:        %{name}-build%{version}.zip
! Source1:	build.xml
! BuildRequires:  java-rpmbuild >= 0:1.6
  BuildRequires:  ant
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
--- 8,14 ----
  URL:            http://www.trilead.com/Products/Trilead-SSH-2-Java/
  Source0:        %{name}-build%{version}.zip
! Source1:        build.xml
  BuildRequires:  ant
+ BuildRequires:  java-devel
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
***************
*** 31,43 ****
  %prep
  %setup -q -n %{name}-build%{version}
! %{__cp} %{SOURCE1} build.xml
! %remove_java_binaries
  
! # fixing wrong-file-end-of-line-encoding warnings
  %{__sed} -i 's/\r$//g' LICENSE.txt README.txt HISTORY.txt faq/FAQ.html
  %{_bindir}/find examples -name \*.java | %{_bindir}/xargs -t %{__sed} -i 's/\r$//g'
  
  %build
! %ant
  
  %install
--- 31,49 ----
  %prep
  %setup -q -n %{name}-build%{version}
! %{_bindir}/find -name "*.jar" | %{_bindir}/xargs -t %{__rm}
! %{__cp} -p %{SOURCE1} build.xml
  
! # fix file-not-utf8 warnings
! %{_bindir}/iconv -f iso88591 -t utf8 HISTORY.txt > HISTORY.txt.new
! %{__mv} HISTORY.txt.new HISTORY.txt
! 
! # fix wrong-file-end-of-line-encoding warnings
  %{__sed} -i 's/\r$//g' LICENSE.txt README.txt HISTORY.txt faq/FAQ.html
  %{_bindir}/find examples -name \*.java | %{_bindir}/xargs -t %{__sed} -i 's/\r$//g'
  
  %build
! export CLASSPATH=
! export OPT_JAR_LIST=:
! %{ant}
  
  %install
***************
*** 46,59 ****
  # jar
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -a dist/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
  
  # javadoc
  %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__cp} -a javadoc/* \
!   %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
- %create_jar_links
- 
  %clean
  %{__rm} -rf %{buildroot}
--- 52,63 ----
  # jar
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p dist/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
  
  # javadoc
  %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__cp} -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %clean
  %{__rm} -rf %{buildroot}
***************
*** 62,66 ****
  %defattr(0644,root,root,0755)
  %doc LICENSE.txt HISTORY.txt README.txt faq examples
! %{_javadir}/*
  
  %files javadoc
--- 66,71 ----
  %defattr(0644,root,root,0755)
  %doc LICENSE.txt HISTORY.txt README.txt faq examples
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
  
  %files javadoc
***************
*** 69,90 ****
  %{_javadocdir}/%{name}
  
- 
- 
  %changelog
! * Fri Aug 08 2008 Thierry Vignaud <tvignaud at mandriva.com> 0:213-2.0.1mdv2009.0
! + Revision: 269439
! - rebuild early 2009.0 package (before pixel changes)
! 
! * Sat Jun 07 2008 Alexander Kurtakov <akurtakov at mandriva.org> 0:213-0.0.1mdv2009.0
! + Revision: 216709
! - new version 213
! 
! * Mon Mar 03 2008 Alexander Kurtakov <akurtakov at mandriva.org> 0:212-0.0.1mdv2008.1
! + Revision: 177872
! - new version
! 
! * Wed Feb 27 2008 Alexander Kurtakov <akurtakov at mandriva.org> 0:211-0.0.1mdv2008.1
! + Revision: 175924
! - import trilead-ssh2
! 
! 
--- 74,78 ----
  %{_javadocdir}/%{name}
  
  %changelog
! * Mon Jul 13 2009 David Walluck <dwalluck at redhat.com> 0:213-3
! - release




More information about the JPackage-commits mailing list