[Jpackage-commits] dist/subethasmtp2/devel subethasmtp2.spec, 1.3, 1.4

David Walluck david at ryu.zarb.org
Thu Jul 2 17:56:02 CEST 2009


Update of /home/projects/jpackage/cvs/dist/subethasmtp2/devel
In directory ryu.zarb.org:/tmp/cvs-serv26676

Modified Files:
	subethasmtp2.spec 
Log Message:
- fix BuildRoot

Index: subethasmtp2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/subethasmtp2/devel/subethasmtp2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** subethasmtp2.spec	12 Jun 2009 12:10:39 -0000	1.3
--- subethasmtp2.spec	2 Jul 2009 15:56:00 -0000	1.4
***************
*** 34,48 ****
  Name:           subethasmtp2
  Version:        2.1
! Release:        1%{dist}
  Epoch:          0
! Summary:        A multithreaded standalone SMTP mail server implementation
! 
  Group:          Development/Libraries/Java
! License:        Apache License 2.0
  URL:            http://subethasmtp.tigris.org
  Source0:        subethasmtp-2.1.tar.gz
  # svn export http://subethasmtp.googlecode.com/svn/tags/2.1/ subethasmtp-2.1
  Source1:        http://repo1.maven.org/maven2/org/subethamail/subethasmtp/2.1.0/subethasmtp-2.1.0.pom
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildArch:      noarch
--- 34,47 ----
  Name:           subethasmtp2
  Version:        2.1
! Release:        2%{dist}
  Epoch:          0
! Summary:        Multithreaded standalone SMTP mail server implementation
  Group:          Development/Libraries/Java
! License:        ASL 2.0
  URL:            http://subethasmtp.tigris.org
  Source0:        subethasmtp-2.1.tar.gz
  # svn export http://subethasmtp.googlecode.com/svn/tags/2.1/ subethasmtp-2.1
  Source1:        http://repo1.maven.org/maven2/org/subethamail/subethasmtp/2.1.0/subethasmtp-2.1.0.pom
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  BuildArch:      noarch
***************
*** 99,103 ****
  
  %build
! ant smtp-jar junit javadoc
  
  %install
--- 98,104 ----
  
  %build
! export OPT_JAR_LIST=:
! export CLASSPATH=
! %{ant} smtp-jar junit javadoc
  
  %install
***************
*** 105,109 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 target/smtp/subethasmtp.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
--- 106,110 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 target/smtp/subethasmtp.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
***************
*** 111,115 ****
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.subethamail subethasmtp 2.1.0 JPP %{name}
  
--- 112,116 ----
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.subethamail subethasmtp 2.1.0 JPP %{name}
  
***************
*** 117,121 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
--- 118,122 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %clean
***************
*** 129,144 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
  * Fri Jun 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.1.0-1.jpp5
  - First release
-  
--- 130,148 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Thu Jul 02 2009 David Walluck <dwalluck at redhat.com> 0:2.1.0-2
+ - fix BuildRoot
+ 
  * Fri Jun 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.1.0-1.jpp5
  - First release




More information about the JPackage-commits mailing list