diff --git a/.cvsignore b/.cvsignore index 8820616..c2d293c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.8.2.tar.gz +htop-0.8.3.tar.gz diff --git a/htop-0.8.2-arrays.patch b/htop-0.8.2-arrays.patch deleted file mode 100644 index 0654d8a..0000000 --- a/htop-0.8.2-arrays.patch +++ /dev/null @@ -1,71 +0,0 @@ -Index: FunctionBar.c -=================================================================== ---- FunctionBar.c (revision 162) -+++ FunctionBar.c (working copy) -@@ -52,12 +52,14 @@ FunctionBar* FunctionBar_new(char** func - this->functions = malloc(sizeof(char*) * 15); - this->keys = malloc(sizeof(char*) * 15); - this->events = malloc(sizeof(int) * 15); -- int i = 0; -- while (i < 15 && functions[i]) { -+ int i; -+ for (i = 0; i < 15; i++) { -+ if (functions[i] == NULL) /* We don't know the size of the array, */ -+ break; /* so let's assume it is NULL terminated */ -+ /* and break if we find that NULL */ - this->functions[i] = String_copy(functions[i]); - this->keys[i] = String_copy(keys[i]); - this->events[i] = events[i]; -- i++; - } - this->size = i; - } else { -Index: htop.c -=================================================================== ---- htop.c (revision 162) -+++ htop.c (working copy) -@@ -151,7 +151,7 @@ static void showHelp(ProcessList* pl) { - clear(); - } - --static char* CategoriesFunctions[10] = {" ", " ", " ", " ", " ", " ", " ", " ", " ", "Done "}; -+static char* CategoriesFunctions[] = {" ", " ", " ", " ", " ", " ", " ", " ", " ", "Done ", NULL}; - - static void Setup_run(Settings* settings, int headerHeight) { - ScreenManager* scr = ScreenManager_new(0, headerHeight, 0, -1, HORIZONTAL, true); -@@ -190,7 +190,7 @@ static HandlerResult pickWithEnter(Panel - } - - static Object* pickFromVector(Panel* panel, Panel* list, int x, int y, char** keyLabels, FunctionBar* prevBar) { -- char* fuKeys[2] = {"Enter", "Esc"}; -+ char* fuKeys[] = {"Enter", "Esc", NULL}; - int fuEvents[2] = {13, 27}; - if (!list->eventHandler) - Panel_setEventHandler(list, pickWithEnter); -@@ -326,7 +326,7 @@ int main(int argc, char** argv) { - Panel_setRichHeader(panel, ProcessList_printHeader(pl)); - - char* searchFunctions[] = {"Next ", "Exit ", " Search: ", NULL}; -- char* searchKeys[] = {"F3", "Esc", " "}; -+ char* searchKeys[] = {"F3", "Esc", " ", NULL}; - int searchEvents[] = {KEY_F(3), 27, ERR}; - FunctionBar* searchBar = FunctionBar_new(searchFunctions, searchKeys, searchEvents); - -@@ -656,7 +656,7 @@ int main(int argc, char** argv) { - - Panel* affinityPanel = AffinityPanel_new(pl->processorCount, curr); - -- char* fuFunctions[2] = {"Set ", "Cancel "}; -+ char* fuFunctions[3] = {"Set ", "Cancel ", NULL}; - void* set = pickFromVector(panel, affinityPanel, 15, headerHeight, fuFunctions, defaultBar); - if (set) { - unsigned long new = AffinityPanel_getAffinity(affinityPanel); -@@ -695,7 +695,7 @@ int main(int argc, char** argv) { - { - Panel* sortPanel = Panel_new(0, 0, 0, 0, LISTITEM_CLASS, true, ListItem_compare); - Panel_setHeader(sortPanel, "Sort by"); -- char* fuFunctions[2] = {"Sort ", "Cancel "}; -+ char* fuFunctions[] = {"Sort ", "Cancel ", NULL}; - ProcessField* fields = pl->fields; - for (int i = 0; fields[i]; i++) { - char* name = String_trim(Process_fieldTitles[fields[i]]); diff --git a/htop.spec b/htop.spec index 87adee5..16470ad 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop -Version: 0.8.2 -Release: 2%{?dist} +Version: 0.8.3 +Release: 1%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -10,7 +10,7 @@ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz #Patch0: %{name}-0.8.1-nonprint.patch #Patch1: %{name}-0.8.1-processlist.patch -Patch2: %{name}-0.8.2-arrays.patch +#Patch2: %{name}-0.8.2-arrays.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: desktop-file-utils @@ -29,7 +29,7 @@ do top(1). %setup -q #%patch0 -p0 #%patch1 -p0 -%patch2 -p0 +#%patch2 -p0 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in #sed -i -e '2,3d' -e '9d' htop.desktop @@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 09 2009 Adam Miller - 0.8.3-1 +- Update to 0.8.3 + * Thu Jun 18 2009 Adam Miller - 0.8.2-2 - "htop aborts after hitting F6 key" fixed (#504795) - Arrays patch from upstream, patch and build for EPEL diff --git a/import.log b/import.log index 6a6e7c0..3db4aa0 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ htop-0_8-1:EL-4:htop-0.8-1.src.rpm:1218660903 htop-0_8_2-1:EL-4:htop-0.8.2-1.src.rpm:1244055159 +htop-0_8_3-1:EL-4:htop-0.8.3-1.src.rpm:1247149087 diff --git a/sources b/sources index c75da9d..cf62635 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78c2382dc4ff0cf5a29a5c3bc1e556ec htop-0.8.2.tar.gz +5c9f093f9eaddf6e77aa6d54c2116d0c htop-0.8.3.tar.gz