[Jpackage-commits] rpms/free/sqljet fetch-sqljet.sh, 1.1, NONE sqljet-1.0.2.pom, 1.1, NONE sqljet-1.0.4.pom, NONE, 1.1 sqljet.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Thu Oct 20 23:03:33 CEST 2011


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

Modified Files:
	sqljet.spec 
Added Files:
	sqljet-1.0.4.pom 
Removed Files:
	fetch-sqljet.sh sqljet-1.0.2.pom 
Log Message:
1.0.4-1.jpp6

Index: sqljet.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/sqljet/sqljet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sqljet.spec	9 Oct 2010 09:55:13 -0000	1.2
--- sqljet.spec	20 Oct 2011 21:03:31 -0000	1.3
***************
*** 30,49 ****
  
  Name:           sqljet
! Version:        1.0.2
! Release:        3%{?dist}
  Summary:        Pure Java SQLite
- 
  Group:          Development/Libraries
  License:        GPLv2
  URL:            http://sqljet.com/
! # Obtained by sh fetch-sqljet.sh
  Source0:        %{name}-%{version}.tar.bz2
- Source1:        fetch-sqljet.sh
  Source2:        %{name}-browser.sh
  Source3:        %{name}-browser.desktop
  Source4:        %{name}-%{version}.pom
  Patch0:         %{name}-javadoc.patch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! 
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 1.6
--- 30,52 ----
  
  Name:           sqljet
! Version:        1.0.4
! Release:        1%{?dist}
! Epoch:          0
  Summary:        Pure Java SQLite
  Group:          Development/Libraries
  License:        GPLv2
  URL:            http://sqljet.com/
! %if 0
! svn export -r 1166 http://svn.sqljet.com/repos/sqljet/tags/1.0.4 sqljet-1.0.4 && tar cfj sqljet-1.0.4.tar.bz2 sqljet-1.0.4
! %endif
  Source0:        %{name}-%{version}.tar.bz2
  Source2:        %{name}-browser.sh
  Source3:        %{name}-browser.desktop
  Source4:        %{name}-%{version}.pom
  Patch0:         %{name}-javadoc.patch
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! Requires:       java >= 1.6
! Requires:       antlr3
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 1.6
***************
*** 55,65 ****
  BuildRequires:  junit4
  BuildRequires:  desktop-file-utils
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! 
! Requires:  java >= 1.6
! Requires:  antlr3
! 
! BuildArch: noarch
  
  %description
--- 58,63 ----
  BuildRequires:  junit4
  BuildRequires:  desktop-file-utils
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 68,72 ****
  Java application to read and modify SQLite databases.
  
! %package        browser
  Group:          Development/Tools
  Summary:        SQLJet database browser
--- 66,70 ----
  Java application to read and modify SQLite databases.
  
! %package browser
  Group:          Development/Tools
  Summary:        SQLJet database browser
***************
*** 74,91 ****
  Requires:       netbeans-platform
  
! %description    browser
  Utility for browsing SQLJet/SQLite databases.
  
! %package        javadoc
  Group:          Documentation
  Summary:        Javadoc for %{name}
  Requires:       jpackage-utils
  
! %description    javadoc
  API documentation for %{name}.
  
  %prep
  %setup -q
! %patch0
  
  find \( -name '*.class' -o -name '*.jar' \) -delete 
--- 72,89 ----
  Requires:       netbeans-platform
  
! %description browser
  Utility for browsing SQLJet/SQLite databases.
  
! %package javadoc
  Group:          Documentation
  Summary:        Javadoc for %{name}
  Requires:       jpackage-utils
  
! %description javadoc
  API documentation for %{name}.
  
  %prep
  %setup -q
! %patch0 -p0
  
  find \( -name '*.class' -o -name '*.jar' \) -delete 
***************
*** 101,108 ****
  %build
  export CLASSPATH=$(build-classpath antlr3 antlr stringtemplate easymock2 junit4)
  
! ant jars osgi javadoc
! 
! jar umf sqljet/osgi/MANIFEST.MF build/sqljet.jar
  
  %install
--- 99,106 ----
  %build
  export CLASSPATH=$(build-classpath antlr3 antlr stringtemplate easymock2 junit4)
+ export OPT_JAR_LIST=:
+ %{ant} jars osgi javadoc
  
! %{jar} umf sqljet/osgi/MANIFEST.MF build/sqljet.jar
  
  %install
***************
*** 110,126 ****
  
  install -d -m 755 %{buildroot}%{_javadir}
! install -m 644  build/sqljet.jar  %{buildroot}%{_javadir}/%{name}-%{version}.jar
! install -m 644  build/sqljet-browser.jar  %{buildroot}%{_javadir}/%{name}-browser-%{version}.jar
  (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  
  install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -m 644  %{SOURCE4}  %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.tmatesoft.sqljet %{name} %{version} JPP %{name}
  
  install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
! cp -rp build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
  
  install -d -m 755 %{buildroot}%{_bindir}
! install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}-browser
  
  desktop-file-install                                    \
--- 108,124 ----
  
  install -d -m 755 %{buildroot}%{_javadir}
! install -p -m 644 build/sqljet.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! install -p -m 644 build/sqljet-browser.jar %{buildroot}%{_javadir}/%{name}-browser-%{version}.jar
  (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  
  install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -p -m 644  %{SOURCE4} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.tmatesoft.sqljet %{name} %{version} JPP %{name}
  
  install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
! cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
  
  install -d -m 755 %{buildroot}%{_bindir}
! install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}-browser
  
  desktop-file-install                                    \
***************
*** 141,153 ****
  
  %files
! %defattr(-,root,root,-)
! %doc COPYING INSTALL README.txt
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
! %{_datadir}/maven2/*
  %{_mavendepmapfragdir}/*
  
  %files browser
! %defattr(-,root,root,-)
  %{_javadir}/%{name}-browser.jar
  %{_javadir}/%{name}-browser-%{version}.jar
--- 139,151 ----
  
  %files
! %defattr(0644,root,root,0755)
! %doc CHANGES COPYING INSTALL README.txt
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
! %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
  
  %files browser
! %defattr(0644,root,root,0755)
  %{_javadir}/%{name}-browser.jar
  %{_javadir}/%{name}-browser-%{version}.jar
***************
*** 156,163 ****
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/*
  
  %changelog
  * Sat Oct 09 2010 Ralph Apel <r.apel at r-apel.de> 1.0.2-3
  - Add pom and depmap frag
--- 154,165 ----
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/*
  
  %changelog
+ * Thu Oct 20 2011 David Walluck <dwalluck at redhat.com> 0:1.0.4-1
+ - 1.0.4
+ - fix file ownership
+ 
  * Sat Oct 09 2010 Ralph Apel <r.apel at r-apel.de> 1.0.2-3
  - Add pom and depmap frag

--- NEW FILE: sqljet-1.0.4.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.tmatesoft.sqljet</groupId>
  <artifactId>sqljet</artifactId>
  <packaging>jar</packaging>
  <version>1.0.4</version>
  <name>SQLJet</name>
  <description>A pure Java library for managing SQLite databases</description>
  <url>http://sqljet.com/</url>
  <licenses>
    <license>
      <url>http://sqljet.com/</url>
    </license>
  </licenses>
  <distributionManagement>
    <downloadUrl>http://sqljet.com/</downloadUrl>
  </distributionManagement>
  <dependencies>
    <dependency>
      <groupId>org.antlr</groupId>
      <artifactId>antlr-runtime</artifactId>
      <version>3.1.3</version>
      <optional>false</optional>
    </dependency>
  </dependencies>
</project>

--- sqljet-1.0.2.pom DELETED ---

--- fetch-sqljet.sh DELETED ---




More information about the JPackage-commits mailing list