[Jpackage-commits] rpms/free/log4j log4j-chainsaw.sh, 1.4.2.2, 1.4.2.3 log4j-logfactor5.sh, 1.4.2.2, 1.4.2.3 log4j.spec, 1.9.2.2, 1.9.2.3

jpackage jpackage at ryu.zarb.org
Fri Feb 20 20:24:10 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/log4j
In directory ryu.zarb.org:/tmp/GKF1B6uIpi/rpms/free/log4j

Modified Files:
      Tag: JPACKAGE-5_0
	log4j-chainsaw.sh log4j-logfactor5.sh log4j.spec 
Log Message:
1.2.14-15.jpp5



Index: log4j.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/log4j/log4j.spec,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C 2 -d -r1.9.2.2 -r1.9.2.3
*** log4j.spec	8 Feb 2009 16:49:38 -0000	1.9.2.2
--- log4j.spec	20 Feb 2009 19:24:08 -0000	1.9.2.3
***************
*** 29,39 ****
  #
  
! # If you want repolib package to be built,
! # issue the following: 'rpmbuild --with repolib'
! 
! %define _with_repolib 1
  
! %define with_repolib %{?_with_repolib:1}%{!?_with_repolib:0}
! %define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0}
  
  %define repodir %{_javadir}/repository.jboss.com/apache-log4j/1.2.14-brew
--- 29,39 ----
  #
  
! %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
! %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
! %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
! %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without repolib
! %bcond_with bootstrap
  
  %define repodir %{_javadir}/repository.jboss.com/apache-log4j/1.2.14-brew
***************
*** 42,46 ****
  
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
- %define bootstrap %{?_with_bootstrap:1}%{!?_with_bootstrap:%{?_without_bootstrap:0}%{!?_without_bootstrap:%{?_bootstrap:%{_bootstrap}}%{!?_bootstrap:0}}}
  
  %define section free
--- 42,45 ----
***************
*** 48,52 ****
  Name:           log4j
  Version:        1.2.14
! Release:        14%{?dist}
  Epoch:          0
  Summary:        Java logging package
--- 47,51 ----
  Name:           log4j
  Version:        1.2.14
! Release:        15%{?dist}
  Epoch:          0
  Summary:        Java logging package
***************
*** 68,93 ****
  Patch0:         %{name}-logfactor5-userdir.patch
  Patch1:         %{name}-javadoc-xlink.patch
- # FIXME: (dwalluck) I would think a dependency on mx4j here is better than Sun
- # internal, but someone disagrees
  Patch2:         %{name}-mx4j-tools.patch
  Patch3:         %{name}-jmx-Agent.patch
  BuildRequires:  jpackage-utils >= 0:1.7.2
  BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant
! %if ! %{bootstrap}
! BuildRequires:  geronimo-jaf-1.0.2-api
! BuildRequires:  geronimo-javamail-1.3.1-api
! BuildRequires:  geronimo-jms-1.1-api
  BuildRequires:  mx4j
  %endif
- BuildRequires:  jndi
  BuildRequires:  java-javadoc
! Requires:       jpackage-utils >= 0:1.7.2
! Requires:       java >= 0:1.5.0
! #Requires:       xml-commons-apis
! #Requires:       jaxp_parser_impl
! Requires(post):   jpackage-utils >= 0:1.7.2
! Requires(postun): jpackage-utils >= 0:1.7.2
! 
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
--- 67,95 ----
  Patch0:         %{name}-logfactor5-userdir.patch
  Patch1:         %{name}-javadoc-xlink.patch
  Patch2:         %{name}-mx4j-tools.patch
  Patch3:         %{name}-jmx-Agent.patch
+ Requires(post): jpackage-utils >= 0:1.7.2
+ Requires(postun): jpackage-utils >= 0:1.7.2
+ Requires:       java >= 0:1.5.0
+ Requires:       jpackage-utils >= 0:1.7.2
+ %if %without bootstrap
+ Requires:       jaf_1_0_2_api
+ Requires:       jaxp_parser_impl
+ Requires:       javamail_1_3_1_api
+ Requires:       jms_1_1_api
+ Requires:       mx4j
+ %endif
  BuildRequires:  jpackage-utils >= 0:1.7.2
  BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant
! %if %without bootstrap
! BuildRequires:  jaf_1_0_2_api
! BuildRequires:  javamail_1_3_1_api
! BuildRequires:  jms_1_1_api
  BuildRequires:  mx4j
  %endif
  BuildRequires:  java-javadoc
! BuildRequires:  jaxp_parser_impl
! BuildRequires:  jndi
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
***************
*** 128,137 ****
  %prep
  %setup -q -n logging-%{name}-%{version}
! %patch0 -b .sav
! %patch1 -b .sav
! #%%patch2 -b .sav2
! #%%patch3 -b .sav
  %{__perl} -pi -e 's/\r$//g' LICENSE NOTICE
  
  # remove all the stuff we'll build ourselves
  find . -name "*.jar" -o -name "*.class" | xargs %{__rm}
--- 130,145 ----
  %prep
  %setup -q -n logging-%{name}-%{version}
! %patch0 -p0
! %patch1 -p0
! %patch2 -p0
! %patch3 -p0
  %{__perl} -pi -e 's/\r$//g' LICENSE NOTICE
  
+ for file in contribs/JimMoore/mail-2001-03-12T1454 contribs/JimMoore/mail-2001-03-13T0646; do
+     %{__mv} ${file} ${file}.orig
+     %{_bindir}/iconv -f iso-8859-1 -t utf8 -o ${file} ${file}.orig
+     %{__rm} ${file}.orig
+ done
+ 
  # remove all the stuff we'll build ourselves
  find . -name "*.jar" -o -name "*.class" | xargs %{__rm}
***************
*** 147,151 ****
  export CLASSPATH=
  export OPT_JAR_LIST=:
! %ant \
          -Djavamail.jar=$(build-classpath javamail_1_3_1_api) \
          -Dactivation.jar=$(build-classpath jaf_1_0_2_api) \
--- 155,159 ----
  export CLASSPATH=
  export OPT_JAR_LIST=:
! %{ant} \
          -Djavamail.jar=$(build-classpath javamail_1_3_1_api) \
          -Dactivation.jar=$(build-classpath jaf_1_0_2_api) \
***************
*** 211,225 ****
  
  %if %{with_repolib}
! install -d -m 755 $RPM_BUILD_ROOT%{repodir}
! install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{repodir}/component-info.xml
! tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
! sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! sed -i "s/@VERSION@/%{version}-brew/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{PATCH1} $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! cp -p $RPM_BUILD_ROOT%{_javadir}/log4j.jar $RPM_BUILD_ROOT%{repodirlib}
  %endif
  
--- 219,233 ----
  
  %if %{with_repolib}
! %__install -d -m 755 $RPM_BUILD_ROOT%{repodir}
! %__install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! %__install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{repodir}/component-info.xml
! tag=`/bin/echo %{name}-%{version}-%{release} | %__sed 's|\.|_|g'`
! %__sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! %__sed -i "s/@VERSION@/%{version}-brew/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! %__install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
! %__install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
! %__install -p -m 644 %{PATCH1} $RPM_BUILD_ROOT%{repodirsrc}
! %__install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! %__cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/log4j.jar
  %endif
  
***************
*** 287,292 ****
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %{_datadir}/applications/*chainsaw.desktop
  %{_datadir}/applications/*logfactor5.desktop
--- 295,300 ----
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  %{_datadir}/applications/*chainsaw.desktop
  %{_datadir}/applications/*logfactor5.desktop
***************
*** 297,301 ****
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
  
--- 305,310 ----
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.db
! %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.so
  %endif
  
***************
*** 317,320 ****
--- 326,334 ----
  
  %changelog
+ * Fri Feb 20 2009 David Walluck <dwalluck at redhat.com> 0:1.2.14-15
+ - fix JMX support
+ - require the API providers that are used for build
+ - fix file-not-utf8
+ 
  * Fri Feb 06 2009 Ralph Apel <r.apel at r-apel.de> 0:1.2.14-14
  - Add pom and depmap frag




More information about the JPackage-commits mailing list