rpms/toped/F-8 import.log, NONE, 1.1 toped_release_0.9_patch_654_721.patch, NONE, 1.1 toped.spec, 1.9, 1.10
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Sun Jul 27 08:41:43 UTC 2008
Author: chitlesh
Update of /cvs/pkgs/rpms/toped/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29608/F-8
Modified Files:
toped.spec
Added Files:
import.log toped_release_0.9_patch_654_721.patch
Log Message:
fixing startup crash
--- NEW FILE import.log ---
toped-0_9_0-2_fc9:F-8:toped-0.9.0-2.fc9.src.rpm:1217148022
toped_release_0.9_patch_654_721.patch:
--- NEW FILE toped_release_0.9_patch_654_721.patch ---
Index: configure
===================================================================
--- configure (revision 654)
+++ configure (revision 721)
@@ -25581,7 +25581,7 @@
if test "$WX_CONFIG_PATH" != "no" ; then
WX_VERSION=""
- min_wx_version=2.6.2
+ min_wx_version=2.8.7
if test -z "" ; then
{ echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5
echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6; }
@@ -26983,21 +26983,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $ac_file | $ac_file:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -27034,7 +27035,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
Index: src/layoutcanvas.h
===================================================================
--- src/layoutcanvas.h (revision 654)
+++ src/layoutcanvas.h (revision 721)
@@ -66,6 +66,13 @@
const wxSize& , int* attribList);
virtual ~LayoutCanvas();
wxImage snapshot(void);
+ bool initStatus() {
+#ifdef __WXGTK__
+ return (NULL != x_visual);
+#else
+ return true;
+#endif
+ }
protected:
void OnpaintGL(wxPaintEvent& event);
void OnresizeGL(wxSizeEvent& event);
@@ -124,6 +131,9 @@
bool reperX; // Draw a cursor line across the window parallel to the X axis
bool reperY; // Draw a cursor line across the window parallel to the Y axis
bool long_cursor; //
+#ifdef __WXGTK__
+ XVisualInfo* x_visual; //
+#endif
// StatusLine _status_line;
DECLARE_EVENT_TABLE();
};
Index: src/main.cpp
===================================================================
--- src/main.cpp (revision 654)
+++ src/main.cpp (revision 721)
@@ -451,6 +451,21 @@
GetGlobalDirs();
initDBLib(std::string(localDir.mb_str()));
Toped = DEBUG_NEW tui::TopedFrame( wxT( "Toped" ), wxPoint(50,50), wxSize(1200,900) );
+
+ if (!Toped->view()->initStatus())
+ {
+ bool wbox_status = true;
+
+ wxMessageDialog* dlg1 = DEBUG_NEW wxMessageDialog(Toped,
+ wxT("Toped can't obtain required GLX Visual. Check your video driver/setup please"),
+ wxT("Toped"),
+ wxOK | wxICON_ERROR);
+ dlg1->ShowModal();
+ dlg1->Destroy();
+ //std::string info("Toped can't obtain required GLX Visual. Check your video driver/setup please");
+ //tell_log(console::MT_ERROR,info);
+ return FALSE;
+ }
if (!LoadFontFile("arial1")) return FALSE;
Toped->setIconDir(std::string(tpdUIDir.mb_str()));
Toped->initToolBars();
Index: src/layoutcanvas.cpp
===================================================================
--- src/layoutcanvas.cpp (revision 654)
+++ src/layoutcanvas.cpp (revision 721)
@@ -181,10 +181,17 @@
// EVT_MENU( CM_CHLAY, TopedFrame::OnCurrentLayer )
tui::LayoutCanvas::LayoutCanvas(wxWindow *parent, const wxPoint& pos,
- const wxSize& size, int* attribList): wxGLCanvas(parent, ID_TPD_CANVAS, pos,
- size, 0,wxT("LayoutCanvas"), attribList)
+ const wxSize& size, int* attribList):
+ wxGLCanvas(parent, ID_TPD_CANVAS, pos, size, 0,wxT("LayoutCanvas"), attribList)
{
-
+#ifdef __WXGTK__
+ // Here we'll have to check that we've got what we've asked for. Is is
+ // quite possible that we can't get the requested GL visual. If that is the case
+ // we'll have to aboandon the init sequence right here, otherwise Toped will
+ // crash.
+ x_visual = (XVisualInfo*) m_vi;
+ if (NULL == x_visual) return;
+#endif
crossCur = MakeCursor(crosscursor,16, 16);
//crossCur = DEBUG_NEW wxCursor((const char*)crosscursor,16, 16);
SetCursor(*crossCur);
Index: src/toped.cpp
===================================================================
--- src/toped.cpp (revision 654)
+++ src/toped.cpp (revision 721)
@@ -688,20 +688,22 @@
//----------------------------------------------------------------------------
// the openGL window - the canvas
//----------------------------------------------------------------------------
- int gl_attrib[20] = { WX_GL_RGBA ,
- WX_GL_MIN_RED , 2,
- WX_GL_MIN_GREEN , 2,
- WX_GL_MIN_BLUE , 2,
- WX_GL_MIN_ALPHA , 2,
- WX_GL_MIN_ACCUM_RED , 2,
- WX_GL_MIN_ACCUM_GREEN , 2,
- WX_GL_MIN_ACCUM_BLUE , 2,
- WX_GL_MIN_ACCUM_ALPHA , 2,
+ int gl_attrib[] = {
+ WX_GL_RGBA ,
+ WX_GL_MIN_RED , 8,
+ WX_GL_MIN_GREEN , 8,
+ WX_GL_MIN_BLUE , 8,
+/* WX_GL_MIN_ALPHA , 8,*/
+ WX_GL_MIN_ACCUM_RED , 8,
+ WX_GL_MIN_ACCUM_GREEN , 8,
+ WX_GL_MIN_ACCUM_BLUE , 8,
+/* WX_GL_MIN_ACCUM_ALPHA , 8,*/
+ WX_GL_DOUBLEBUFFER ,
+ GL_NONE };
// WX_GL_DEPTH_SIZE , 1,
- WX_GL_DOUBLEBUFFER ,
- GL_NONE };
+// int* gl_attrib = NULL;
+
_canvas = DEBUG_NEW LayoutCanvas(this, wxDefaultPosition, wxDefaultSize, gl_attrib);
-
//----------------------------------------------------------------------------
// The command line
//----------------------------------------------------------------------------
@@ -724,12 +726,13 @@
LeftDockable(true).
RightDockable(true)
);
- _winManager.AddPane( _canvas, wxAuiPaneInfo().
- CentrePane().
- MaximizeButton(false).
- Floatable(true).
- CloseButton(false)
- );
+ if (_canvas->initStatus())
+ _winManager.AddPane( _canvas, wxAuiPaneInfo().
+ CentrePane().
+ MaximizeButton(false).
+ Floatable(true).
+ CloseButton(false)
+ );
//_winManager.AddPane(_GLstatus, wxAuiPaneInfo().Top().Floatable(false).//Fixed().
// CloseButton(false).CaptionVisible(false).BestSize(wxSize(1000,30)));
_winManager.AddPane(logpane, wxAuiPaneInfo().
Index: configure.ac
===================================================================
--- configure.ac (revision 654)
+++ configure.ac (revision 721)
@@ -62,7 +62,7 @@
#Check wxWidgets
AM_OPTIONS_WXCONFIG
- AM_PATH_WXCONFIG(2.6.2, wxWin=1,,std gl)
+ AM_PATH_WXCONFIG(2.8.7, wxWin=1,,std gl)
if test "$wxWin" != 1 || test "$wx_ver_ok" != "yes"; then
AC_MSG_ERROR([
wxWindows ver.2.6.2 or later must be installed on your system
Index: tpd_DB/tedesign.cpp
===================================================================
--- tpd_DB/tedesign.cpp (revision 654)
+++ tpd_DB/tedesign.cpp (revision 721)
@@ -1025,7 +1025,9 @@
}
DBbox laydata::tdtdesign::activeoverlap() {
- return _target.overlap();
+ DBbox ovl = _target.overlap();
+ if (ovl == DEFAULT_OVL_BOX) ovl = DEFAULT_ZOOM_BOX;
+ return ovl;
// if (_target.checkedit())
// return _target.edit()->overlap() * _ARTM;
// else return DEFAULT_OVL_BOX;
Index: tpd_DB/browsers.cpp
===================================================================
--- tpd_DB/browsers.cpp (revision 654)
+++ tpd_DB/browsers.cpp (revision 721)
@@ -878,7 +878,7 @@
word *laynotemp = DEBUG_NEW word(layno);
eventLAYER_STATUS.SetClientData(static_cast<void*> (laynotemp));
wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_STATUS);
- delete bt1;
+ delete bt1;
}
void browsers::layer_add(const std::string name, const word layno)
@@ -891,7 +891,7 @@
eventLAYER_ADD.SetInt(*bt);
wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_ADD);
- delete bt;
+ delete bt;
}
void browsers::layer_default(const word newlay, const word oldlay)
@@ -905,7 +905,7 @@
eventLAYER_DEF.SetInt(*bt);
wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_DEF);
- delete bt;
+ delete bt;
}
void browsers::addTDTtab(bool newthread)
@@ -1000,10 +1000,10 @@
browsers::LayerInfo::LayerInfo(const LayerInfo& lay)
{
- _name = lay._name;
- _layno = lay._layno;
- _col = lay._col;
- _fill = lay._fill;
+ _name = lay._name;
+ _layno = lay._layno;
+ _col = lay._col;
+ _fill = lay._fill;
}
browsers::LayerInfo::LayerInfo(const std::string &name, const word layno)
@@ -1029,7 +1029,7 @@
_layer = DEBUG_NEW LayerInfo(*layer);
_selected= false;
_hidden = false;
-
+
//_locked = false;
_picture = DEBUG_NEW wxBitmap(size.GetWidth()-16, size.GetHeight(), -1);
@@ -1065,7 +1065,7 @@
stipplebrush = DEBUG_NEW wxBitmap(image, 1);
#endif
_brush = DEBUG_NEW wxBrush( *stipplebrush);
- delete stipplebrush;
+ delete stipplebrush;
}
else
{
@@ -1084,33 +1084,33 @@
_brush->SetColour(color);
//}
- Create(parent, id, pos, size, style, name);
- GetClientSize(&_buttonWidth, &_buttonHeight);
+ Create(parent, id, pos, size, style, name);
+ GetClientSize(&_buttonWidth, &_buttonHeight);
//***Draw main picture***
preparePicture();
- wxString caption(_layer->name().c_str(),wxConvUTF8);
+ wxString caption(_layer->name().c_str(),wxConvUTF8);
SetToolTip(caption);
-
+
}
void browsers::LayerButton::preparePicture()
{
const int clearence = 2;
- int sizeX, sizeY;
- GetParent()->GetClientSize(&sizeX, &sizeY);
- _buttonWidth = sizeX;
- SetSize(_buttonWidth, _buttonHeight);
-
- wxMemoryDC DC;
+ int sizeX, sizeY;
+ GetParent()->GetClientSize(&sizeX, &sizeY);
+ _buttonWidth = sizeX;
+ SetSize(_buttonWidth, _buttonHeight);
+
+ wxMemoryDC DC;
wxFont font(10,wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
DC.SetFont(font);
- //pict.SetWidth(_buttonWidth);
- if (_picture)
- {
- delete _picture;
- _picture = DEBUG_NEW wxBitmap(_buttonWidth-16, _buttonHeight, -1);
- }
+ //pict.SetWidth(_buttonWidth);
+ if (_picture)
+ {
+ delete _picture;
+ _picture = DEBUG_NEW wxBitmap(_buttonWidth-16, _buttonHeight, -1);
+ }
DC.SelectObject(*_picture);
DC.SetBrush(*_brush);
@@ -1128,9 +1128,9 @@
DC.GetTextExtent(layno, &wno, &hno);
DC.DrawText(layno, 0, int((_buttonHeight - hno)/2));
curw += wno + clearence;
-
- wxBrush tempBrush = DC.GetBrush();
- if (_selected)
+
+ wxBrush tempBrush = DC.GetBrush();
+ if (_selected)
{
DC.SetBrush(*wxWHITE_BRUSH);
DC.SetTextForeground(*wxBLACK);
@@ -1142,21 +1142,21 @@
}
const wxString dummy= _T("WWWWWWWWWW");
wxString caption(_layer->name().c_str(),wxConvUTF8);
- if (caption.Len()>10)
- {
- caption[7]=wxT('.');
- caption[8]=wxT('.');
- caption[9]=wxT('.');
- }
+ if (caption.Len()>10)
+ {
+ caption[7]=wxT('.');
+ caption[8]=wxT('.');
+ caption[9]=wxT('.');
+ }
int hna,wna;
DC.GetTextExtent(dummy, &wna, &hna);
DC.DrawRectangle(curw, clearence, wna, _buttonHeight - 2*clearence);
curw += clearence;
DC.DrawText(caption, curw, int(_buttonHeight/2 - hna/2));
- curw += wna;
-
- DC.SetBrush(tempBrush);
- DC.DrawRectangle(curw, clearence, _buttonWidth-curw-16, _buttonHeight-2*clearence);
+ curw += wna;
+
+ DC.SetBrush(tempBrush);
+ DC.DrawRectangle(curw, clearence, _buttonWidth-curw-16, _buttonHeight-2*clearence);
DC.SelectObject(wxNullBitmap);
Refresh();
@@ -1175,7 +1175,7 @@
void browsers::LayerButton::OnPaint(wxPaintEvent&event)
{
- wxPaintDC dc(this);
+ wxPaintDC dc(this);
dc.DrawBitmap(*_picture, 0, 0, false);
if (_selected)
{
@@ -1225,7 +1225,7 @@
eventLAYER_SELECT.SetInt(bt);
assert(Browsers && Browsers->TDTlayers());
- wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_SELECT);
+ wxPostEvent(Browsers->TDTlayers()->getLayerPanel(), eventLAYER_SELECT);
}
}
}
@@ -1268,18 +1268,18 @@
//====================================================================
BEGIN_EVENT_TABLE(browsers::LayerPanel, wxScrolledWindow)
- EVT_TECUSTOM_COMMAND(wxEVT_CMD_BROWSER, wxID_ANY, browsers::LayerPanel::OnCommand)
- EVT_SIZE(browsers::LayerPanel::OnSize)
+ EVT_TECUSTOM_COMMAND(wxEVT_CMD_BROWSER, wxID_ANY, browsers::LayerPanel::OnCommand)
+ EVT_SIZE(browsers::LayerPanel::OnSize)
END_EVENT_TABLE()
//====================================================================
browsers::LayerPanel::LayerPanel(wxWindow* parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style , const wxString& name)
- :wxScrolledWindow(parent, id, pos, size, style, name),
- _selectedButton(NULL)
+ const wxPoint& pos,
+ const wxSize& size,
+ long style , const wxString& name)
+ :wxScrolledWindow(parent, id, pos, size, style, name),
+ _selectedButton(NULL)
{
- _buttonCount = 0;
+ _buttonCount = 0;
}
browsers::LayerPanel::~LayerPanel()
@@ -1298,10 +1298,10 @@
{
word *oldlay = static_cast<word*>(event.GetClientData());
word layno = event.GetExtraLong();
- _buttonMap[*oldlay]->unselect();
- _buttonMap[layno]->select();
+ if (NULL != _buttonMap[*oldlay]) _buttonMap[*oldlay]->unselect();
+ if (NULL != _buttonMap[layno]) _buttonMap[layno]->select();
//_layerlist->defaultLayer((word)event.GetExtraLong(), (word)event.GetInt());
- delete (static_cast<word*>(oldlay));
+ delete (oldlay);
break;
}
case BT_LAYER_HIDE:
@@ -1309,8 +1309,8 @@
word *layno = static_cast<word*>(event.GetClientData());
bool status = (1 == event.GetExtraLong());
//_buttonMap[layno]->hideLayer(event.IsChecked());
- _buttonMap[*layno]->hideLayer(status);
- delete (static_cast<word*>(layno));
+ if (NULL != _buttonMap[*layno]) _buttonMap[*layno]->hideLayer(status);
+ delete (layno);
break;
}
//_layerlist->hideLayer((word)event.GetExtraLong(),event.IsChecked());break;
@@ -1319,8 +1319,8 @@
//_layerlist->lockLayer((word)event.GetExtraLong(),event.IsChecked());
word *layno = static_cast<word*>(event.GetClientData());
bool status = (1 == event.GetExtraLong());
- _buttonMap[*layno]->lockLayer(status);
- delete (static_cast<word*>(layno));
+ if (NULL != _buttonMap[*layno]) _buttonMap[*layno]->lockLayer(status);
+ delete (layno);
break;
}
case BT_LAYER_SELECT:
@@ -1328,32 +1328,26 @@
word layno = event.GetExtraLong();
if (NULL != _selectedButton) _selectedButton->unselect();
_selectedButton = _buttonMap[layno];
-
break;
}
case BT_LAYER_ADD:
{
LayerInfo* layer = static_cast<LayerInfo*>(event.GetClientData());
-
LayerButton *layerButton;
-
layerButtonMap::iterator it;
- int szx, szy;
+ int szx, szy;
//Remove selection from current button
- if (_selectedButton!=NULL) _selectedButton->unselect();
-
+ if (NULL != _selectedButton) _selectedButton->unselect();
it = _buttonMap.find(layer->layno());
- if (it!= _buttonMap.end())
+ if (it != _buttonMap.end())
{
//Button already exists, replace it
LayerButton *tempButton = it->second;
-
//layerButton = DEBUG_NEW LayerButton(this, tui::TMDUMMY_LAYER+_buttonCount, wxPoint (0, _buttonCount*30), wxSize(200, 30),
//wxBU_AUTODRAW, wxDefaultValidator, _T("TTT"), layer);
int x, y;
-
int ID;
tempButton->GetPosition(&x, &y);
tempButton->GetSize(&szx, &szy);
@@ -1362,22 +1356,19 @@
wxBU_AUTODRAW|wxNO_BORDER, wxDefaultValidator, _T("button"), layer);
_buttonMap[layer->layno()] = layerButton;
delete tempButton;
-
}
else
{
//Button doesn't exist, create new button
// int szx, szy;
- GetClientSize(&szx, &szy);
+ GetClientSize(&szx, &szy);
layerButton = DEBUG_NEW LayerButton(this, tui::TMDUMMY_LAYER+_buttonCount,
wxPoint (0, _buttonCount*buttonHeight), wxSize(szx, buttonHeight),
wxBU_AUTODRAW, wxDefaultValidator, _T("button"), layer);
_buttonMap[layer->layno()] = layerButton;
-
_buttonCount++;
this->SetScrollbars(0, buttonHeight, 0, _buttonCount);
}
-
//Restore selection
if ((it = _buttonMap.find(DATC->curlay()))!= _buttonMap.end())
{
@@ -1386,7 +1377,7 @@
}
//_selectedButton = (_buttonMap.begin())->second;
//_selectedButton->select();
- delete (static_cast<LayerInfo*>(layer));
+ delete (static_cast<LayerInfo*>(layer));
break;
}
}
@@ -1394,12 +1385,12 @@
void browsers::LayerPanel::OnSize(wxSizeEvent& evt)
{
- for(layerButtonMap::const_iterator it = _buttonMap.begin(); it!=_buttonMap.end();++it)
- {
- LayerButton *button = it->second;
- button->preparePicture();
- }
- Refresh();
+ for(layerButtonMap::const_iterator it = _buttonMap.begin(); it!=_buttonMap.end();++it)
+ {
+ LayerButton *button = it->second;
+ button->preparePicture();
+ }
+ Refresh();
}
wxString browsers::LayerPanel::getAllSelected()
@@ -1487,5 +1478,5 @@
wxString browsers::LayerBrowser::getAllSelected()
{
- return _layerPanel->getAllSelected();
+ return _layerPanel->getAllSelected();
}
Index: aclocal.m4
===================================================================
--- aclocal.m4 (revision 654)
+++ aclocal.m4 (revision 721)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,13 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -6584,7 +6587,7 @@
AC_MSG_RESULT([$SED])
])
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -6599,7 +6602,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -6615,8 +6618,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -6888,7 +6893,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -6936,13 +6941,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -7047,16 +7052,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -7328,7 +7334,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-8/toped.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- toped.spec 25 May 2008 09:03:46 -0000 1.9
+++ toped.spec 27 Jul 2008 08:41:13 -0000 1.10
@@ -1,6 +1,6 @@
Name: toped
Version: 0.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: VLSI IC Layout Editor
License: GPLv2
@@ -10,6 +10,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://download2.berlios.de/%{name}/%{name}-%{version}.tar.bz2
+Patch0: toped_release_0.9_patch_654_721.patch
BuildRequires: desktop-file-utils
BuildRequires: wxGTK-devel
@@ -23,18 +24,11 @@
Toped is listed among Fedora Electronic Lab packages.
-%package devel
-Summary: Toped - development files
-Group: Applications/Engineering
-Requires: %{name} = %{version}-%{release}
-
-
-%description devel
-Development files for the Toped.
-
%prep
%setup -q
+%patch0 -p0 -b .composite
+
# instead of exporting the variable $TPD_GLOBAL
sed -i 's|\$TPD_GLOBAL\/|%{_datadir}/%{name}/|' src/main.cpp
sed -i 's|\*\$TPD_GLOBAL\*|%{_datadir}/%{name}/|' src/main.cpp
@@ -76,9 +70,9 @@
#No translations
#%find_lang %{name}
-#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_common.so
-#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so
-#%{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so
+%{__rm} -rf %{buildroot}%{_libdir}/libtpd_common.so
+%{__rm} -rf %{buildroot}%{_libdir}/libtpd_DB.so
+%{__rm} -rf %{buildroot}%{_libdir}/libtpd_parser.so
#spurious-executable-perm
chmod 0644 COPYING
@@ -107,11 +101,11 @@
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*x*/apps/toped.png
-%files devel
-%{_libdir}/libtpd*.so
-
%Changelog
+* Fri Jul 26 2008 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.0-2
+- Bug fix 451218
+
* Sun May 25 2008 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.9.0-1
- New upstream release
More information about the fedora-extras-commits
mailing list