[Jpackage-commits] dist/jcip-annotations/JPP-6 jcip-annotations-component-info.xml, NONE, 1.1 jcip-annotations.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Thu Feb 12 21:09:04 CET 2009


Update of /home/projects/jpackage/cvs/dist/jcip-annotations/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv30342

Modified Files:
	jcip-annotations.spec 
Added Files:
	jcip-annotations-component-info.xml 
Log Message:
- add repolib
- fix Release tag


--- NEW FILE: jcip-annotations-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="net/jcip"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="jcip-annotations.jar"/>


    <export>
      <include input="jcip-annotations.jar"/>

    </export>
  </component>
</project>

Index: jcip-annotations.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jcip-annotations/JPP-6/jcip-annotations.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jcip-annotations.spec	7 Aug 2008 15:04:11 -0000	1.1
--- jcip-annotations.spec	12 Feb 2009 20:09:02 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,32 ****
--- 29,43 ----
  #
  
+ %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
+ 
+ %define repodir %{_javadir}/repository.jboss.com/net/jcip/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
***************
*** 35,79 ****
  Name:           jcip-annotations
  Version:        1.0
! Release:        1%{dist}
  Epoch:          0
  Summary:        Java Concurrency in Practice
  License:        Creative Commons Attribution License
  Group:          Development/Java
- #Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- #Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  URL:            http://www.jcip.net/
  Source0:        http://www.jcip.net/jcip-annotations-src.jar
  Source1:        http://repo1.maven.org/maven/livetribe/maven/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom
! #Patch0:         aQute-bndlib-Filter.patch
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  %if %{gcj_support}
- BuildRequires:    gnu-crypto
  BuildRequires:    java-gcj-compat-devel
! Requires(post):   java-gcj-compat
! Requires(postun): java-gcj-compat
! %endif
! 
! 
! %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
! 
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel = 0:1.5.0
! #BuildRequires:  ant >= 0:1.6.5
! #BuildRequires:  ecj
! #BuildRequires:  eclipse-ecj
! #BuildRequires:  eclipse-platform
! #BuildRequires:  eclipse-rcp
! 
! Requires:  java >= 0:1.5.0
! #Requires:  ant >= 0:1.6.5
! #Requires:  ecj
! #Requires:  eclipse-ecj
! #Requires:  eclipse-platform
! #Requires:  eclipse-rcp
! Requires(post):    jpackage-utils >= 0:1.7.4
! Requires(postun):  jpackage-utils >= 0:1.7.4
  
  %description
--- 46,69 ----
  Name:           jcip-annotations
  Version:        1.0
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Java Concurrency in Practice
  License:        Creative Commons Attribution License
  Group:          Development/Java
  URL:            http://www.jcip.net/
  Source0:        http://www.jcip.net/jcip-annotations-src.jar
  Source1:        http://repo1.maven.org/maven/livetribe/maven/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom
! Source2:        jcip-annotations-component-info.xml
! Requires(post): jpackage-utils >= 0:1.7.4
! Requires(postun): jpackage-utils >= 0:1.7.4
! Requires:       java >= 0:1.5.0
! BuildRequires:  java-devel >= 0:1.5.0
! BuildRequires:  jpackage-utils >= 0:1.7.5
  %if %{gcj_support}
  BuildRequires:    java-gcj-compat-devel
! %else
  BuildArch:      noarch
  %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 83,92 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- #Requires(post):   /bin/rm,/bin/ln
- #Requires(postun): /bin/rm
  
  %description javadoc
  Javadoc for %{name}.
  
  
  %prep
--- 73,90 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
  Javadoc for %{name}.
  
+ %if %with repolib
+ %package repolib
+ Summary:        Artifacts to be uploaded to a repository library
+ Group:          Development/Libraries/Java
+ 
+ %description repolib
+ Artifacts to be uploaded to a repository library.
+ This package is not meant to be installed but so its contents
+ can be extracted through rpm2cpio.
+ %endif
  
  %prep
***************
*** 96,118 ****
  mkdir -p src/main/java/
  mv net src/main/java
- #%patch0 -b .sav0
  
  %build
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
! 
! $JAVA_HOME/bin/javac -d target/classes $(find src/main/java -name "*.java")
! $JAVA_HOME/bin/javadoc -d target/site/apidocs -sourcepath src/main/java net.jcip.annotations
  for f in $(find aQute/ -type f -not -name "*.class"); do
      cp $f target/classes/$f
  done
  pushd target/classes
! $JAVA_HOME/bin/jar cmf ../../META-INF/MANIFEST.MF ../%{name}-%{version}.jar *
  popd
  
  %install
  rm -rf $RPM_BUILD_ROOT
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 target/%{name}-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %add_to_maven_depmap net.jcip jcip-annotations %{version} JPP %{name}
--- 94,115 ----
  mkdir -p src/main/java/
  mv net src/main/java
  
  %build
! export CLASSPATH=
! %{javac} -d target/classes $(find src/main/java -name "*.java")
! %{javadoc} -d target/site/apidocs -sourcepath src/main/java net.jcip.annotations
  for f in $(find aQute/ -type f -not -name "*.class"); do
      cp $f target/classes/$f
  done
  pushd target/classes
! %{jar} cmf ../../META-INF/MANIFEST.MF ../%{name}-%{version}.jar *
  popd
  
  %install
  rm -rf $RPM_BUILD_ROOT
+ 
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 target/%{name}-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %add_to_maven_depmap net.jcip jcip-annotations %{version} JPP %{name}
***************
*** 121,125 ****
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # javadoc
--- 118,122 ----
  # 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
  
  # javadoc
***************
*** 128,133 ****
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %if %{gcj_support}
- export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm
  %endif
--- 125,142 ----
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
+ %if %with repolib
+ %{__install} -d -m 755 %{buildroot}%{repodir}
+ %{__install} -d -m 755 %{buildroot}%{repodirlib}
+ %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{repodir}/component-info.xml
+ tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
+ %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
+ %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
+ %{__install} -d -m 755 %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
+ %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/jcip-annotations.jar
+ %endif
+ 
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
  %endif
***************
*** 136,148 ****
  rm -rf $RPM_BUILD_ROOT
  
- #%post javadoc
- #rm -f %{_javadocdir}/%{name}
- #ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- #%postun javadoc
- #if [ "$1" = "0" ]; then
- #  rm -f %{_javadocdir}/%{name}
- #fi
- 
  %post
  %update_maven_depmap
--- 145,148 ----
***************
*** 164,183 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  %if %{gcj_support}
! %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
  * Thu Aug 07 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.0-1.jpp5
  - First release
- 
--- 164,193 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_datadir}/maven2/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
! 
! %if %with repolib
! %files repolib
! %defattr(0644,root,root,0755)
! %{_javadir}/repository.jboss.com
! %endif
  
  %changelog
+ * Wed Feb 11 2009 David Walluck <dwalluck at redhat.com> 0:1.0-2
+ - add repolib
+ - fix Release tag
+ 
  * Thu Aug 07 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.0-1.jpp5
  - First release




More information about the JPackage-commits mailing list