[Jpackage-commits] dist/greenmail/devel greenmail.spec,1.2,1.3

David Walluck david at ryu.zarb.org
Thu Jul 2 17:43:57 CEST 2009


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

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

Index: greenmail.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/greenmail/devel/greenmail.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** greenmail.spec	12 Jun 2009 13:00:46 -0000	1.2
--- greenmail.spec	2 Jul 2009 15:43:55 -0000	1.3
***************
*** 34,47 ****
  Name:           greenmail
  Version:        1.3.1
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Email test server
- 
  Group:          Development/Libraries/Java
! License:        Apache License 2.0
  URL:            http://www.icegreen.com/greenmail/
  Source0:        http://switch.dl.sourceforge.net/sourceforge/greenmail/greenmail-1.3.1b-src.zip
  Source1:        %{name}-%{namedversion}.pom
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildArch:      noarch
--- 34,46 ----
  Name:           greenmail
  Version:        1.3.1
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Email test server
  Group:          Development/Libraries/Java
! License:        ASL 2.0
  URL:            http://www.icegreen.com/greenmail/
  Source0:        http://switch.dl.sourceforge.net/sourceforge/greenmail/greenmail-1.3.1b-src.zip
  Source1:        %{name}-%{namedversion}.pom
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  BuildArch:      noarch
***************
*** 91,95 ****
  
  %build
! ant all
  
  %install
--- 90,96 ----
  
  %build
! export OPT_JAR_LIST=:
! export CLASSPATH=
! %{ant} all
  
  %install
***************
*** 97,101 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 build/lib/%{name}-%{namedversion}.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)
--- 98,102 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 build/lib/%{name}-%{namedversion}.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)
***************
*** 103,107 ****
  # 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 com.icegreen %{name} %{namedversion} JPP %{name}
  
--- 104,108 ----
  # 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 com.icegreen %{name} %{namedversion} JPP %{name}
  
***************
*** 121,136 ****
  
  %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:1.3.1-1.jpp5
  - First release 1.3.1b
-  
--- 122,139 ----
  
  %files
! %defattr(0644,root,root,0755)
  %{_javadir}/*.jar
  %{_datadir}/maven2/poms/*
! %{_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:1.3.1-2
+ - fix BuildRoot
+ 
  * Fri Jun 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.3.1-1.jpp5
  - First release 1.3.1b




More information about the JPackage-commits mailing list