[Jpackage-commits] dist/postgresql-jdbc/JPP-6 .cvsignore, 1.3, 1.4 postgresql-9.0-801.jdbc4.pom, NONE, 1.1 postgresql-jdbc.spec, 1.3, 1.4 sources, 1.3, 1.4

David Walluck david at ryu.zarb.org
Fri Dec 17 21:38:56 CET 2010


Update of /home/projects/jpackage/cvs/dist/postgresql-jdbc/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv28775

Modified Files:
	.cvsignore postgresql-jdbc.spec sources 
Added Files:
	postgresql-9.0-801.jdbc4.pom 
Log Message:
- 9.0-801

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/postgresql-jdbc/JPP-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** .cvsignore	10 Mar 2009 17:31:50 -0000	1.3
--- .cvsignore	17 Dec 2010 20:38:54 -0000	1.4
***************
*** 1 ****
! postgresql-jdbc-8.3-604.src.tar.gz
--- 1 ----
! postgresql-jdbc-9.0-801.src.tar.gz

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/postgresql-jdbc/JPP-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** sources	10 Mar 2009 17:31:50 -0000	1.3
--- sources	17 Dec 2010 20:38:54 -0000	1.4
***************
*** 1 ****
! b1e591dd66fd0ebdd7023afdf33c7b5a  postgresql-jdbc-8.3-604.src.tar.gz
--- 1 ----
! 32188109251f8da2766da77b174232bc  postgresql-jdbc-9.0-801.src.tar.gz

Index: postgresql-jdbc.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/postgresql-jdbc/JPP-6/postgresql-jdbc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** postgresql-jdbc.spec	10 Mar 2009 17:36:12 -0000	1.3
--- postgresql-jdbc.spec	17 Dec 2010 20:38:54 -0000	1.4
***************
*** 29,39 ****
  #
  
! %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 section         devel
! %define upstreamver     8.3-604
  
  Name:           postgresql-jdbc
! Version:        8.3.604
  Release:        1%{?dist}
  Epoch:          0
--- 29,56 ----
  #
  
! %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_with gcj_support
! %bcond_without repolib
! 
! %define repodir %{_javadir}/repository.jboss.com/postgresql/postgresql/%{namedversion}-brew
! %define repodirlib %{repodir}/lib
! %define repodirsrc %{repodir}/src
! 
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
! 
! %define section free
! %define uversion 9.0-801
! %define namedversion %{uversion}.jdbc4
  
  Name:           postgresql-jdbc
! Version:        9.0.801
  Release:        1%{?dist}
  Epoch:          0
***************
*** 42,46 ****
  Group:          Applications/Databases
  URL:            http://jdbc.postgresql.org/
! Source0:        http://jdbc.postgresql.org/download/postgresql-jdbc-8.3-604.src.tar.gz
  BuildRequires:  ant >= 0:1.6.2
  BuildRequires:  ant-junit >= 0:1.6.2
--- 59,68 ----
  Group:          Applications/Databases
  URL:            http://jdbc.postgresql.org/
! Source0:        http://jdbc.postgresql.org/download/postgresql-jdbc-9.0-801.src.tar.gz
! Source1:        http://repo1.maven.org/maven2/postgresql/postgresql/9.0-801.jdbc4/postgresql-9.0-801.jdbc4.pom
! Obsoletes:      rh-postgresql-jdbc <= %{version}-%{release}
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       jpackage-utils
  BuildRequires:  ant >= 0:1.6.2
  BuildRequires:  ant-junit >= 0:1.6.2
***************
*** 48,51 ****
--- 70,74 ----
  BuildRequires:  jpackage-utils >= 0:1.5
  BuildRequires:  junit >= 0:3.7
+ BuildRequires:  maven2-plugin-deploy
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
***************
*** 53,57 ****
  BuildArch:      noarch
  %endif
- Obsoletes:      rh-postgresql-jdbc < %{version}-%{release}
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
--- 76,79 ----
***************
*** 61,95 ****
  Java programs to access a PostgreSQL database.
  
  %prep
! %setup -c -q
! mv %{name}-%{upstreamver}.src/* .
! rm %{name}-%{upstreamver}.src/.cvsignore
! rmdir %{name}-%{upstreamver}.src/
  
! # remove any binary libs
! find -name "*.jar" -or -name "*.class" | xargs -t rm
  
  %build
  export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/junit`
  export CLASSPATH=
! sh ./update-translations.sh
! %{ant}
  
  %install
! rm -rf ${RPM_BUILD_ROOT}
  
! install -d %{buildroot}%{_javadir}
  # Per jpp conventions, jars have version-numbered names and we add
  # versionless symlinks.
! install -p -m 644 jars/postgresql.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
  
! pushd %{buildroot}%{_javadir}
! ln -s %{name}-%{version}.jar %{name}.jar
! # Also, for backwards compatibility with our old postgresql-jdbc packages,
! # add these symlinks.  (Probably only the jdbc3 symlink really makes sense?)
! ln -s postgresql-jdbc.jar postgresql-jdbc2.jar
! ln -s postgresql-jdbc.jar postgresql-jdbc2ee.jar
! ln -s postgresql-jdbc.jar postgresql-jdbc3.jar
! popd
  
  %if %{gcj_support}
--- 83,146 ----
  Java programs to access a PostgreSQL database.
  
+ %package javadoc
+ Summary:        Javadoc for %{name}
+ Group:          Documentation
+ Requires:       jpackage-utils
+ 
+ %description javadoc
+ %{summary}.
+ 
+ %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
! %setup -q -c
! mv %{name}-%{uversion}.src/* .
! rm %{name}-%{uversion}.src/.cvsignore
! rmdir %{name}-%{uversion}.src/
  
! %{_bindir}/find -type f -name "*.jar" -or -type f -name "*.class" -o -type f -name ".cvsignore" | %{_bindir}/xargs -t %{__rm}
  
  %build
  export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/junit`
  export CLASSPATH=
! /bin/sh ./update-translations.sh
! %{ant} all publicapi
  
  %install
! rm -rf %{buildroot}
  
! mkdir -p %{buildroot}%{_javadir}
  # Per jpp conventions, jars have version-numbered names and we add
  # versionless symlinks.
! cp -p jars/postgresql.jar %{buildroot}%{_javadir}/%{name}-%{namedversion}.jar
! %{jar} cf %{buildroot}%{_javadir}/%{name}-sources-%{namedversion}.jar -C . org/
! %{jar} cf %{buildroot}%{_javadir}/%{name}-javadoc-%{namedversion}.jar -C build/publicapi .
! ln -s %{name}-%{namedversion}.jar %{buildroot}%{_javadir}/postgresql-jdbc2-%{namedversion}.jar
! ln -s %{name}-%{namedversion}.jar %{buildroot}%{_javadir}/postgresql-jdbc2ee-%{namedversion}.jar
! ln -s %{name}-%{namedversion}.jar %{buildroot}%{_javadir}/postgresql-jdbc3-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do ln -s ${jar} ${jar/-%{namedversion}/}; done)
  
! mkdir -p %{buildroot}%{_datadir}/maven2/poms
! cp -p %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap postgresql postgresql %{namedversion} JPP %{name}
! 
! mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! cp -pr build/publicapi/* %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! ln -s %{name}-%{namedversion} %{buildroot}%{_javadocdir}/%{name}
! 
! %if %with repolib
! %{_bindir}/mvn-jpp deploy:deploy-file -DgroupId=postgresql -DartifactId=postgresql -Dversion=%{namedversion} -Dpackaging=jar -Dfile=%{buildroot}%{_javadir}/%{name}-%{namedversion}.jar -DpomFile=%{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom -Durl=file://%{buildroot}%{_javadir}/repository.jboss.com/maven2-brew -DrepositoryId=jboss-releases
! %{_bindir}/mvn-jpp deploy:deploy-file -DgroupId=postgresql -DartifactId=postgresql -Dversion=%{namedversion} -Dpackaging=jar -Dfile=%{buildroot}%{_javadir}/%{name}-javadoc-%{namedversion}.jar -Durl=file://%{buildroot}%{_javadir}/repository.jboss.com/maven2-brew -DrepositoryId=jboss-releases -Dclassifier=javadoc
! %{_bindir}/mvn-jpp deploy:deploy-file -DgroupId=postgresql -DartifactId=postgresql -Dversion=%{namedversion} -Dpackaging=jar -Dfile=%{buildroot}%{_javadir}/%{name}-sources-%{namedversion}.jar -Durl=file://%{buildroot}%{_javadir}/repository.jboss.com/maven2-brew -DrepositoryId=jboss-releases -Dclassifier=sources
! %endif
  
  %if %{gcj_support}
***************
*** 100,105 ****
  rm -rf %{buildroot}
  
- %if %{gcj_support}
  %post
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
--- 151,156 ----
  rm -rf %{buildroot}
  
  %post
+ %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
***************
*** 107,113 ****
  fi
  %endif
  
- %if %{gcj_support}
  %postun
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
--- 158,166 ----
  fi
  %endif
+ %update_maven_depmap
  
  %postun
+ %update_maven_depmap
+ %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
***************
*** 119,127 ****
  %defattr(0644,root,root,0755)
  %doc LICENSE README doc/*
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_javadir}/postgresql-jdbc2.jar
! %{_javadir}/postgresql-jdbc2ee.jar
! %{_javadir}/postgresql-jdbc3.jar
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
--- 172,189 ----
  %defattr(0644,root,root,0755)
  %doc LICENSE README doc/*
! %{_javadir}*/%{name}-%{namedversion}.jar
! %{_javadir}*/%{name}.jar
! %{_javadir}*/%{name}-javadoc-%{namedversion}.jar
! %{_javadir}*/%{name}-javadoc.jar
! %{_javadir}*/%{name}-sources-%{namedversion}.jar
! %{_javadir}*/%{name}-sources.jar
! %{_javadir}*/postgresql-jdbc2-%{namedversion}.jar
! %{_javadir}*/postgresql-jdbc2.jar
! %{_javadir}*/postgresql-jdbc2ee-%{namedversion}.jar
! %{_javadir}*/postgresql-jdbc2ee.jar
! %{_javadir}*/postgresql-jdbc3-%{namedversion}.jar
! %{_javadir}*/postgresql-jdbc3.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
***************
*** 130,134 ****
--- 192,212 ----
  %endif
  
+ %files javadoc
+ %defattr(0644,root,root,0755)
+ %{_javadocdir}/%{name}-%{namedversion}
+ %{_javadocdir}/%{name}
+ 
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %dir %{_javadir}*/
+ %dir %{_javadir}*/repository.jboss.com
+ %{_javadir}*/repository.jboss.com
+ %endif
+ 
  %changelog
+ * Fri Dec 17 2010 David Walluck <dwalluck at redhat.com> 0:9.0.801-1
+ - 9.0-801
+ 
  * Tue Mar 10 2009 David Walluck <dwalluck at redhat.com> 0:8.3.604-1
  - 8.3.604

--- NEW FILE: postgresql-9.0-801.jdbc4.pom ---
<?xml version="1.0"?>
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>postgresql</groupId>
  <artifactId>postgresql</artifactId>
  <packaging>jar</packaging>
  <name>PostgreSQL JDBC Driver</name>
  <version>9.0-801.jdbc4</version>
  <url>http://jdbc.postgresql.org</url>
  <description>The PostgreSQL Driver JDBC4</description>
  <licenses>
    <license>
      <name>BSD License</name>
      <url>http://jdbc.postgresql.org/license.html</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
</project>




More information about the JPackage-commits mailing list