OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Steffen Weinreich
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Aug-2005 10:01:20
Branch: HEAD Handle: 2005080809011900
Modified files:
openpkg-src/taskjuggler taskjuggler.patch taskjuggler.spec
Log:
upgrading package: taskjuggler 2.1 -> 2.1.1
Summary:
Revision Changes Path
1.2 +272 -274 openpkg-src/taskjuggler/taskjuggler.patch
1.3 +2 -2 openpkg-src/taskjuggler/taskjuggler.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/taskjuggler/taskjuggler.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 taskjuggler.patch
--- openpkg-src/taskjuggler/taskjuggler.patch 6 May 2005 11:45:50 -0000
1.1
+++ openpkg-src/taskjuggler/taskjuggler.patch 8 Aug 2005 08:01:19 -0000
1.2
@@ -1,7 +1,246 @@
+Index: Makefile.in
+--- Makefile.in.orig 2005-08-06 18:06:40 +0200
++++ Makefile.in 2005-08-08 09:49:06 +0200
+@@ -355,35 +355,6 @@
+ .SUFFIXES:
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am
$(am__configure_deps)
+-#>- @for dep in $?; do \
+-#>- case '$(am__configure_deps)' in \
+-#>- *$$dep*) \
+-#>- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+-#>- cd $(srcdir) && $(AUTOMAKE) --foreign \
+-#>- && exit 0; \
+-#>- exit 1;; \
+-#>- esac; \
+-#>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+-#>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign Makefile
+-#>+ 14
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+- ( \
+- cd $(srcdir) && $(AUTOMAKE) --foreign \
+- ) || exit 1; echo ' cd $(top_srcdir) && perl admin/am_edit '; cd
$(top_srcdir) && perl admin/am_edit && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign Makefile
+- cd $(top_srcdir) && perl admin/am_edit Makefile.in
+-.PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+@@ -397,14 +368,6 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+-$(top_srcdir)/configure: $(am__configure_deps)
+-#>- cd $(srcdir) && $(AUTOCONF)
+-#>+ 2
+- cd $(srcdir) && rm -f configure
+- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+-
+ config.h: stamp-h1
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+Index: admin/cvs.sh
+--- admin/cvs.sh.orig 2005-08-06 18:06:15 +0200
++++ admin/cvs.sh 2005-08-08 09:49:06 +0200
+@@ -8,6 +8,9 @@
+
+ call_and_fix_autoconf()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ $AUTOCONF || exit 1
+ if test -r configure.in.in ; then
+ perl -pi -e "print \"if test \\\"x\\\$with_fast_perl\\\" =
\\\"xyes\\\"; then\
+@@ -20,6 +23,9 @@
+
+ strip_makefile()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ if test ! -f $makefile_wo; then
+ perl -e '$in=0; while ( <> ) { $in = 1 if ($_ =~ m/^if / ); print $_
unless ($in || $_ =~ m/^include /); $in = 0 if ($_ =~ m/^endif/); }' <
$makefile_am > $makefile_wo
+ fi
+@@ -27,6 +33,9 @@
+
+ check_autotool_versions()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ required_autoconf_version="2.53 or newer"
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+@@ -92,6 +101,9 @@
+
+ cvs()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ check_autotool_versions
+ acinclude_m4
+
+@@ -155,6 +167,9 @@
+
+ dist()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ check_autotool_versions
+
+ ###
+@@ -216,6 +231,9 @@
+
+ subdir_dist()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ $ACLOCAL $ACLOCALFLAGS
+ $AUTOHEADER
+ $AUTOMAKE
+@@ -232,6 +250,9 @@
+
+ configure_in()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ rm -f configure.in configure.in.new
+ kde_use_qt_param=
+ test -f configure.files || { echo "need configure.files for configure.in";
exit 1; }
+@@ -335,6 +356,9 @@
+
+ configure_files()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ echo "*** Creating configure.files"
+ admindir=NO
+ for i in . .. ../.. ../../..; do
+@@ -371,6 +395,9 @@
+
+ create_subdirs()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then
+ # as many modules contain rules to create subdirs without any
+ # dependencies make won't create it unless there is no file.
+@@ -395,6 +422,9 @@
+
+ subdirs()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ dirs=
+ idirs=
+ if test -f inst-apps; then
+@@ -444,6 +474,9 @@
+
+ Makefile_am()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ if test -f Makefile.am.in; then
+ compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head
-n 1`
+ compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -n
1`
+@@ -485,6 +518,9 @@
+
+ acinclude_m4()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ echo "*** Creating acinclude.m4"
+ adds=
+ if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then
+@@ -507,6 +543,9 @@
+
+ cvs_clean()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ if test -d CVS; then :; else
+ echo "You don't have a toplevel CVS directory."
+ echo "You most certainly didn't use cvs to get these sources."
+@@ -518,6 +557,9 @@
+
+ package_merge()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ catalogs=$POFILES
+ for cat in $catalogs; do
+ msgmerge -o $cat.new $cat $PACKAGE.pot
+@@ -536,6 +578,9 @@
+
+ extract_messages()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ podir=${podir:-$PWD/po}
+ files=`find . -name Makefile.am | xargs egrep -l '^messages:' `
+ dirs=`for i in $files; do echo \`dirname $i\`; done`
+@@ -580,6 +625,9 @@
+
+ package_messages()
+ {
++# OpenPKG doesn't need this
++exit 0
++
+ rm -rf po.backup
+ mkdir po.backup
+
+@@ -633,6 +681,9 @@
+ rm -f $makefile_wo
+ fi
+
++# OpenPKG doesn't need this
++exit 0
++
+ # Suck in the AUTOCONF detection code
+ . $admindir/detect-autoconf.sh
+
+Index: admin/missing
+--- admin/missing.orig 2005-08-06 18:06:15 +0200
++++ admin/missing 2005-08-08 09:49:06 +0200
+@@ -1,4 +1,8 @@
+ #! /bin/sh
++
++# OpenPKG doesn't need this
++exit 0
++
+ # Common stub for a few missing GNU programs while installing.
+ # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <[EMAIL PROTECTED]>, 1996.
Index: configure
---- configure.orig 2005-03-07 11:23:15.000000000 +0100
-+++ configure 2005-05-03 11:33:32.227493826 +0200
-@@ -2077,178 +2077,6 @@
+--- configure.orig 2005-08-06 18:06:32 +0200
++++ configure 2005-08-08 09:49:06 +0200
+@@ -2090,178 +2090,6 @@
unset CDPATH
@@ -180,7 +419,7 @@
echo "$as_me:$LINENO: checking where to install" >&5
echo $ECHO_N "checking where to install... $ECHO_C" >&6
if test "x$prefix" = "xNONE"; then
-@@ -5756,7 +5584,7 @@
+@@ -5779,7 +5607,7 @@
*-*-irix*) test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS
-D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
*-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
*-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
@@ -189,249 +428,33 @@
if test "$GXX" = yes; then
libstdcpp=`$CXX -print-file-name=libstdc++.so`
if test ! -f $libstdcpp; then
-
-Index: admin/cvs.sh
---- admin/cvs.sh.orig 2005-01-05 13:39:32.000000000 +0100
-+++ admin/cvs.sh 2005-05-03 12:28:50.588904325 +0200
-@@ -8,6 +8,9 @@
-
- call_and_fix_autoconf()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- $AUTOCONF || exit 1
- if test -r configure.in.in ; then
- perl -pi -e "print \"if test \\\"x\\\$with_fast_perl\\\" =
\\\"xyes\\\"; then\
-@@ -20,6 +23,9 @@
-
- strip_makefile()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- if test ! -f $makefile_wo; then
- perl -e '$in=0; while ( <> ) { $in = 1 if ($_ =~ m/^if / ); print $_
unless ($in || $_ =~ m/^include /); $in = 0 if ($_ =~ m/^endif/); }' <
$makefile_am > $makefile_wo
- fi
-@@ -27,6 +33,9 @@
-
- check_autotool_versions()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- required_autoconf_version="2.53 or newer"
- AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
- case $AUTOCONF_VERSION in
-@@ -90,6 +99,9 @@
-
- cvs()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- check_autotool_versions
- acinclude_m4
-
-@@ -153,6 +165,9 @@
-
- dist()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- check_autotool_versions
-
- ###
-@@ -214,6 +229,9 @@
-
- subdir_dist()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- $ACLOCAL $ACLOCALFLAGS
- $AUTOHEADER
- $AUTOMAKE
-@@ -230,6 +248,9 @@
-
- configure_in()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- rm -f configure.in configure.in.new
- kde_use_qt_param=
- test -f configure.files || { echo "need configure.files for configure.in";
exit 1; }
-@@ -333,6 +354,9 @@
-
- configure_files()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- echo "*** Creating configure.files"
- admindir=NO
- for i in . .. ../.. ../../..; do
-@@ -369,6 +393,9 @@
-
- create_subdirs()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then
- # as many modules contain rules to create subdirs without any
- # dependencies make won't create it unless there is no file.
-@@ -393,6 +420,9 @@
-
- subdirs()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- dirs=
- idirs=
- if test -f inst-apps; then
-@@ -442,6 +472,9 @@
-
- Makefile_am()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- if test -f Makefile.am.in; then
- compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head
-n 1`
- compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -n
1`
-@@ -483,6 +516,9 @@
-
- acinclude_m4()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- echo "*** Creating acinclude.m4"
- adds=
- if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then
-@@ -505,6 +541,9 @@
-
- cvs_clean()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- if test -d CVS; then :; else
- echo "You don't have a toplevel CVS directory."
- echo "You most certainly didn't use cvs to get these sources."
-@@ -516,6 +555,9 @@
-
- package_merge()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- catalogs=$POFILES
- for cat in $catalogs; do
- msgmerge -o $cat.new $cat $PACKAGE.pot
-@@ -534,6 +576,9 @@
-
- extract_messages()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- podir=${podir:-$PWD/po}
- files=`find . -name Makefile.am | xargs egrep -l '^messages:' `
- dirs=`for i in $files; do echo \`dirname $i\`; done`
-@@ -578,6 +623,9 @@
-
- package_messages()
- {
-+# OpenPKG doesn't need this
-+exit 0
-+
- rm -rf po.backup
- mkdir po.backup
-
-@@ -631,6 +679,9 @@
- rm -f $makefile_wo
- fi
-
-+# OpenPKG doesn't need this
-+exit 0
-+
- # Suck in the AUTOCONF detection code
- . $admindir/detect-autoconf.sh
+Index: subdirs
+--- subdirs.orig 2005-08-06 18:06:23 +0200
++++ subdirs 2005-08-08 09:52:42 +0200
+@@ -1,8 +1,5 @@
+ taskjuggler
+ Contrib
+-Examples
+ TaskJuggler
+-TestSuite
+-docs
+ ktjview2
+ tjx2gantt
+Index: taskjuggler/Utility.cpp
+--- taskjuggler/Utility.cpp.orig 2005-08-06 18:06:10 +0200
++++ taskjuggler/Utility.cpp 2005-08-08 09:49:06 +0200
+@@ -812,7 +812,7 @@
+ return 0;
+ }
-Index: admin/missing
---- admin/missing.orig 2005-05-03 12:24:30.016172906 +0200
-+++ admin/missing 2005-05-03 12:24:33.157658242 +0200
-@@ -1,4 +1,8 @@
- #! /bin/sh
-+
-+# OpenPKG doesn't need this
-+exit 0
-+
- # Common stub for a few missing GNU programs while installing.
- # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <[EMAIL PROTECTED]>, 1996.
-Index: Makefile.in
---- Makefile.in.orig 2005-05-03 12:30:37.610417000 +0200
-+++ Makefile.in 2005-05-03 12:37:01.462306438 +0200
-@@ -351,35 +351,6 @@
- .SUFFIXES:
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am
$(am__configure_deps)
--#>- @for dep in $?; do \
--#>- case '$(am__configure_deps)' in \
--#>- *$$dep*) \
--#>- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
--#>- cd $(srcdir) && $(AUTOMAKE) --foreign \
--#>- && exit 0; \
--#>- exit 1;; \
--#>- esac; \
--#>- done; \
--#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
--#>- cd $(top_srcdir) && \
--#>- $(AUTOMAKE) --foreign Makefile
--#>+ 14
-- @for dep in $?; do \
-- case '$(am__configure_deps)' in \
-- *$$dep*) \
-- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-- ( \
-- cd $(srcdir) && $(AUTOMAKE) --foreign \
-- ) || exit 1; echo ' cd $(top_srcdir) && perl admin/am_edit '; cd
$(top_srcdir) && perl admin/am_edit && exit 0; \
-- exit 1;; \
-- esac; \
-- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --foreign Makefile
-- cd $(top_srcdir) && perl admin/am_edit Makefile.in
--.PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
-@@ -393,14 +364,6 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
+- struct tm t = { sec, min, hour, d, m - 1, y - 1900, 0, 0, -1, 0, 0 };
++ struct tm t = { sec, min, hour, d, m - 1, y - 1900, 0, 0 };
+ time_t localTime = mktime(&t);
--$(top_srcdir)/configure: $(am__configure_deps)
--#>- cd $(srcdir) && $(AUTOCONF)
--#>+ 2
-- cd $(srcdir) && rm -f configure
-- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--
- config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
+ if (restoreTZ)
Index: tjx2gantt/tjx2gantt
---- tjx2gantt/tjx2gantt.orig 2004-11-17 13:28:16 +0100
-+++ tjx2gantt/tjx2gantt 2005-05-06 13:08:17 +0200
+--- tjx2gantt/tjx2gantt.orig 2005-08-06 18:06:11 +0200
++++ tjx2gantt/tjx2gantt 2005-08-08 09:49:06 +0200
@@ -112,8 +112,8 @@
my $task_space = 3; #-- task-space
my $header_height = 10;
@@ -443,7 +466,7 @@
my $res_count = scalar (keys %rmap);
my $res_height = (($task_height + $task_space) * $res_count);
#$res_height = 0; # erst mal apschalten
-@@ -123,7 +124,7 @@
+@@ -123,7 +123,7 @@
$header_height * 3 +
(($task_height + $task_space) * $task_count) + $res_height;
@@ -452,7 +475,7 @@
_make_poster();
use Data::Dumper;
-@@ -137,7 +139,7 @@
+@@ -137,7 +137,7 @@
#---------------- make poster ------------------------------
sub _make_poster {
my $format;
@@ -461,7 +484,7 @@
while(<IN>) {
next unless /BoundingBox:/;
$_ =~ s/.*BoundingBox:\s+\d+\s+\d+\s+(\d+)\s+(\d+)/$1\*$2p/;
-@@ -145,8 +147,8 @@
+@@ -145,8 +145,8 @@
$format = $_;
}
close(IN);
@@ -472,7 +495,7 @@
}
#---------------- xml stuff --------------------------------
-@@ -268,11 +270,13 @@
+@@ -268,11 +268,13 @@
}
#---------------- bunt stuff --------------------------------
@@ -488,7 +511,7 @@
colour => 1,
units => "mm",
reencode => "ISOLatin1Encoding");
-@@ -284,7 +285,7 @@
+@@ -284,7 +286,7 @@
_draw_depends($p);
_draw_label($p);
@@ -497,28 +520,3 @@
print " done\n";
}
-Index: taskjuggler/Utility.cpp
---- taskjuggler/Utility.cpp.orig 2005-05-03 12:47:18.708086910 +0200
-+++ taskjuggler/Utility.cpp 2005-05-03 12:47:20.226399643 +0200
-@@ -812,7 +812,7 @@
- return 0;
- }
-
-- struct tm t = { sec, min, hour, d, m - 1, y - 1900, 0, 0, -1, 0, 0 };
-+ struct tm t = { sec, min, hour, d, m - 1, y - 1900, 0, 0 };
- time_t localTime = mktime(&t);
-
- if (restoreTZ)
-Index: subdirs
---- subdirs.orig 2005-03-07 11:23:02.000000000 +0100
-+++ subdirs 2005-05-03 13:06:19.372250061 +0200
-@@ -1,9 +1,6 @@
- taskjuggler
- Contrib
--Examples
- TaskJuggler
--TestSuite
--docs
- ktjview
- ktjview2
- tjx2gantt
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/taskjuggler/taskjuggler.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 taskjuggler.spec
--- openpkg-src/taskjuggler/taskjuggler.spec 6 May 2005 11:45:50 -0000
1.2
+++ openpkg-src/taskjuggler/taskjuggler.spec 8 Aug 2005 08:01:19 -0000
1.3
@@ -32,8 +32,8 @@
Class: EVAL
Group: Development
License: GPL
-Version: 2.1
-Release: 20050506
+Version: 2.1.1
+Release: 20050808
# list of sources
Source0:
http://www.taskjuggler.org/download/taskjuggler-%{version}.tar.bz2
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
