[pdf-renderer] New svn checkout Drop gcj as per new guidelines

Orcan Ogetbil oget at fedoraproject.org
Fri Mar 11 03:41:03 UTC 2011


commit d96d810fb1f9bb7a87a8d5717f7986f61b356b83
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Thu Mar 10 22:41:00 2011 -0500

    New svn checkout
    Drop gcj as per new guidelines

 .gitignore               |    1 +
 pdf-renderer-snapshot.sh |   31 ++++++++++++++++++++++++++++++
 pdf-renderer.spec        |   47 ++++++++++-----------------------------------
 sources                  |    2 +-
 4 files changed, 44 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f4fd35e..5ffca5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 PDFRenderer-2009_04_05-src.zip
+/pdf-renderer-128svn-20110310.tar.bz2
diff --git a/pdf-renderer-snapshot.sh b/pdf-renderer-snapshot.sh
new file mode 100644
index 0000000..71e63aa
--- /dev/null
+++ b/pdf-renderer-snapshot.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+    set +e
+    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+date=$(date +%Y%m%d)
+name=pdf-renderer
+
+pushd "$tmp"
+svn checkout https://svn.java.net/svn/pdf-renderer~svn/trunk $name-$date
+pushd $name-$date
+svn=$(svnversion)svn
+find . -type d -name "\.svn" | xargs rm -fr -- || :
+popd>/dev/null
+
+# Remove the web content
+rm -fr $name-$date/www/
+
+mv $name-$date $name-$svn-$date
+tar jcf "$pwd"/$name-$svn-$date.tar.bz2 $name-$svn-$date
+echo "Wrote $name-$svn-$date.tar.bz2"
+popd >/dev/null
diff --git a/pdf-renderer.spec b/pdf-renderer.spec
index 8159a26..d3bc4fe 100644
--- a/pdf-renderer.spec
+++ b/pdf-renderer.spec
@@ -1,29 +1,23 @@
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 %global alternate_name PDFRenderer
-%global cvs_version 2009_04_05
-%global cvs_rel .%(echo %{cvs_version}|sed 's|_||g')cvs
+%global svn_date 20110310
+%global svn_version 128svn
 
 Summary:        A 100% Java PDF renderer and viewer
 Name:           pdf-renderer
 Version:        0
-Release:        0.7%{?cvs_rel}%{?dist}
+Release:        0.8.%{svn_version}.%{svn_date}%{?dist}
 License:        LGPLv2+
 URL:            https://pdf-renderer.dev.java.net/
 Group:          Development/Libraries
-Source0:        https://pdf-renderer.dev.java.net/files/documents/6008/131974/%{alternate_name}-%{cvs_version}-src.zip
+Source0:        %{name}-%{svn_version}-%{svn_date}.tar.bz2
+# To fetch the source code
+Source1:        %{name}-snapshot.sh
 BuildRequires:  ant
 BuildRequires:  ant-apache-regexp
 BuildRequires:  java-devel >= 1.7
 BuildRequires:  jpackage-utils
 BuildRequires:  urw-fonts
-%if %{with_gcj}
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-Requires:         java-1.5.0-gcj
-%else
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       java >= 1.7
 Requires:       jpackage-utils >= 1.5
@@ -48,7 +42,7 @@ Requires:       jpackage-utils
 API documentation for the %{alternate_name} package.
 
 %prep
-%setup -q -n %{alternate_name}-%{cvs_version}-src
+%setup -q -n %{name}-%{svn_version}-%{svn_date}
 
 # Remove preshipped binaries
 find . -name "*.jar" -exec rm {} \;
@@ -96,10 +90,6 @@ mkdir -p $RPM_BUILD_ROOT%{_javadir}
 install -m 644 dist/%{alternate_name}.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
-%if %{with_gcj}
- %{_bindir}/aot-compile-rpm
-%endif
-
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -107,30 +97,11 @@ cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ] 
- then
-  %{_bindir}/rebuild-gcj-db
- fi
-%endif
-
-%postun
-%if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ] 
- then
-  %{_bindir}/rebuild-gcj-db
- fi
-%endif
-
 
 %files
 %defattr(-,root,root,-)
 %doc demos
 %{_javadir}/%{name}.jar
-%if %{with_gcj}
-%{_libdir}/gcj/%{name}
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -139,6 +110,10 @@ if [ -x %{_bindir}/rebuild-gcj-db ]
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Mar 10 2011 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0-0.8.128svn.20110310
+- New svn checkout
+- Drop gcj as per new guidelines
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.7.20090405cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 3bb702b..ea75b06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d366b17cb5ef6d000dbd241d4fb4182c  PDFRenderer-2009_04_05-src.zip
+f46cdc9f014e3ec9d47704e46b249209  pdf-renderer-128svn-20110310.tar.bz2


More information about the scm-commits mailing list