[Bug 225644] Merge Review: classpathx-mail

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.


https://bugzilla.redhat.com/show_bug.cgi?id=225644


Orion Poplawski <orion@xxxxxxxxxxxxx> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |ASSIGNED
         AssignedTo|nobody@xxxxxxxxxxxxxxxxx    |orion@xxxxxxxxxxxxx




--- Comment #1 from Orion Poplawski <orion@xxxxxxxxxxxxx>  2009-10-08 13:05:20 EDT ---
Created an attachment (id=364160)
 --> (https://bugzilla.redhat.com/attachment.cgi?id=364160)
Updated classpath.spec

Here is a proposed updated spec.

Also, upstream url for inetlib-1.1.1 differs slightly from CVS lookaside cache
so I propose uploading the URL version.

--- classpathx-mail.spec        24 Jul 2009 19:01:58 -0000      1.32            
+++ classpathx-mail.spec        8 Oct 2009 17:04:52 -0000                       
@@ -28,16 +28,14 @@                                                             
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.         
 #                                                                              

-%define _gcj_support 1                                                         
-                                                                               
-%define gcj_support
%{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}                         

 %define jmailver 1.3.1                                                         
 %define inetlibver 1.1.1                                                       

 Name:           classpathx-mail                                                
 Version:        1.1.1                                                          
-Release:        9.1%{?dist}                                                    
+Release:        9.2%{?dist}                                                    
 Epoch:          0                                                              
 Summary:        GNU JavaMail(tm)                                               

@@ -46,7 +44,7 @@                                                               
 License:        GPLv2+ with exceptions                                         
 URL:            http://www.gnu.org/software/classpathx/                        
 Source0:        http://ftp.gnu.org/gnu/classpathx/mail-%{version}.tar.gz       
-Source1:        http://ftp.gnu.org/gnu/classpath/inetlib-1.1.1.tar.gz          
+Source1:        http://ftp.gnu.org/gnu/classpath/inetlib-%{inetlibver}.tar.gz  
 # see bz157685                                                                 
 Patch1:         %{name}-docbuild.patch                                         
 Patch2:         %{name}-add-inetlib.patch                                      
@@ -55,7 +53,11 @@                                                              
 Patch4:         classpath-inetlib-docbuild.patch                               
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 

-%if ! %{gcj_support}                                                           
+%if %{with_gcj}                                                                
+BuildRequires:          java-gcj-compat-devel                                  
+Requires(post):         java-gcj-compat                                        
+Requires(postun):       java-gcj-compat                                        
+%else                                                                          
 BuildArch:      noarch                                                         
 %endif                                                                         
 BuildRequires:  jpackage-utils >= 0:1.5                                        
@@ -74,11 +76,6 @@                                                              
 Provides:       javamail-monolithic = 0:%{jmailver}                            
 Obsoletes:      classpathx-mail-monolithic <= 0:1.1.1_2jpp_6rh                 

-%if %{gcj_support}                                                             
-BuildRequires:         java-gcj-compat-devel                                   
-Requires(post):                java-gcj-compat                                 
-Requires(postun):      java-gcj-compat                                         
-%endif                                                                         

 %description                                                                   
 GNU JavaMail(tm) is a free implementation of the JavaMail API.                 
@@ -169,7 +166,7 @@                                                             
 cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{jmailver}                
 ln -s %{name}-%{jmailver} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost
symlink     

-%if %{gcj_support}                                                             
+%if %{with_gcj}                                                                
 %{_bindir}/aot-compile-rpm                                                     
 %endif                                                                         

@@ -186,14 +183,14 @@                                                           
 %post                                                                          
 %{_sbindir}/update-alternatives --install %{_javadir}/javamail.jar javamail
%{_javadir}/classpathx-mail-1.3.1-monolithic.jar 010301                         

-%if %{gcj_support}                                                             
+%if %{with_gcj}                                                                
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif

-%if %{gcj_support}
+%if %{with_gcj}
 %postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
@@ -229,8 +226,8 @@
 %{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar
 %ghost %{_javadir}/javamail.jar

-%if %{gcj_support}
-%attr(-,root,root)
%{_libdir}/gcj/%{name}/classpathx-mail-1.3.1-monolithic-1.1.1.jar.*
+%if %{with_gcj}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 # These ones are included in the monolithic one above
 #%attr(-,root,root) %{_libdir}/gcj/%{name}/mail-1.3.1-api-1.1.1.jar.*
 #%attr(-,root,root) %{_libdir}/gcj/%{name}/mail-1.3.1-providers-1.1.1.jar.*
@@ -242,6 +239,14 @@
 %{_javadocdir}/%{name}

 %changelog
+* Tue Oct 6 2009 Orion Poplawski <orion@xxxxxxxxxxxxx> - 0:1.1.1-9.2
+- Merge Review chages (bug #225644)
+- Update to current gcj macro style, own gcj package directory
+- Change tabs to spaces
+- Fixup macro named in changelog
+- Re-upload inetlib-1.1.1.tar.gz - slightly different than lookaside
+  cache
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx>
- 0:1.1.1-9.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

@@ -305,7 +310,7 @@

 * Mon Nov 14 2005 Fernando Nasser <fnasser@xxxxxxxxxx> 0:1.1.1-2jpp
 - Change handling of alternatives to 6-digit scheme
-- Change handling of javadocs to new %{_netsharedpath} and
+- Change handling of javadocs to new %%{_netsharedpath} and
   "/usr/share mounted read only" friendly scheme

 * Fri Nov 11 2005 Vadim Nasardinov <vadimn@xxxxxxxxxx> - 0:1.0-4jpp_3fc

-- 
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.

_______________________________________________
Fedora-package-review mailing list
Fedora-package-review@xxxxxxxxxx
http://www.redhat.com/mailman/listinfo/fedora-package-review

[Index of Archives]     [Fedora Legacy]     [Fedora Desktop]     [Fedora SELinux]     [Yosemite News]     [KDE Users]     [Fedora Tools]