[svn] r6057 - in trunk/rpms: . alpine cyphesis lha perl-KinoSearch php-pear-db unoconv wput

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Fri Dec 21 14:40:13 CET 2007


Author: dag
Date: 2007-12-21 14:40:09 +0100 (Fri, 21 Dec 2007)
New Revision: 6057

Added:
   trunk/rpms/lha/
   trunk/rpms/lha/lha-114i-malloc.patch
   trunk/rpms/lha/lha-114i-sec.patch
   trunk/rpms/lha/lha-114i-sec2.patch
   trunk/rpms/lha/lha-114i-symlink.patch
   trunk/rpms/lha/lha-dir_length_bounds_check.patch
   trunk/rpms/lha/lha.spec
   trunk/rpms/php-pear-db/
   trunk/rpms/php-pear-db/php-pear-db.spec
Modified:
   trunk/rpms/alpine/alpine.spec
   trunk/rpms/cyphesis/cyphesis.spec
   trunk/rpms/perl-KinoSearch/perl-KinoSearch.spec
   trunk/rpms/unoconv/unoconv.spec
   trunk/rpms/wput/wput.spec
Log:
Updates

Modified: trunk/rpms/alpine/alpine.spec
===================================================================
--- trunk/rpms/alpine/alpine.spec	2007-12-21 12:02:46 UTC (rev 6056)
+++ trunk/rpms/alpine/alpine.spec	2007-12-21 13:40:09 UTC (rev 6057)
@@ -3,7 +3,7 @@
 
 Summary: Alternative Pine mail user agent implementation
 Name: alpine
-Version: 0.99999
+Version: 1.00
 Release: 1
 License: Apache License
 Group: Applications/Internet
@@ -15,7 +15,7 @@
 BuildRequires: inews, aspell, openldap-devel, openssl-devel, krb5-devel
 ### RPM bug causes package to conflict with itself
 #Conflicts: pine
-#Obsoletes: pine <= 4.64
+Obsoletes: pine <= 4.64
 Provides: pine = 4.64
 
 %description
@@ -83,6 +83,9 @@
 %{_sbindir}/mlock
 
 %changelog
+* Fri Dec 21 2007 Dag Wieers <dag at wieers.com> - 1.00-1
+- Updated to release 1.00.
+
 * Tue Nov 20 2007 Dag Wieers <dag at wieers.com> - 0.99999-1
 - Updated to release 0.99999.
 

Modified: trunk/rpms/cyphesis/cyphesis.spec
===================================================================
--- trunk/rpms/cyphesis/cyphesis.spec	2007-12-21 12:02:46 UTC (rev 6056)
+++ trunk/rpms/cyphesis/cyphesis.spec	2007-12-21 13:40:09 UTC (rev 6057)
@@ -12,8 +12,9 @@
 Source: http://dl.sf.net/worldforge/cyphesis-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRequires: python-devel >= 2.2
 BuildRequires: varconf-devel >= 0.6.4, atlas-c++-devel, mercator-devel, skstream-devel
-BuildRequires: postgresql-devel, python-devel, readline-devel, gcc-c++
+BuildRequires: postgresql-devel, readline-devel, gcc-c++
 BuildRequires: wfmath-devel, libgcrypt-devel, libsigc++20-devel, atlas-c++
 BuildRequires: pkgconfig
 

Added: trunk/rpms/lha/lha-114i-malloc.patch
===================================================================
--- trunk/rpms/lha/lha-114i-malloc.patch	                        (rev 0)
+++ trunk/rpms/lha/lha-114i-malloc.patch	2007-12-21 13:40:09 UTC (rev 6057)
@@ -0,0 +1,10 @@
+--- lha-114i/src/lha.h.orig	2004-05-19 19:24:19.000000000 -0400
++++ lha-114i/src/lha.h	2004-05-19 19:23:19.000000000 -0400
+@@ -16,6 +16,7 @@
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <sys/stat.h>
++#include <malloc.h>
+ 
+ #include <signal.h>
+ 

Added: trunk/rpms/lha/lha-114i-sec.patch
===================================================================
--- trunk/rpms/lha/lha-114i-sec.patch	                        (rev 0)
+++ trunk/rpms/lha/lha-114i-sec.patch	2007-12-21 13:40:09 UTC (rev 6057)
@@ -0,0 +1,75 @@
+--- lha-114i/src/header.c.orig	2000-10-05 19:36:03.000000000 +0200
++++ lha-114i/src/header.c	2004-04-21 14:30:52.000000000 +0200
+@@ -538,6 +538,10 @@
+ 				/*
+ 				 * filename
+ 				 */
++				if (header_size >= 256) {
++				  fprintf(stderr, "Possible buffer overflow hack attack, type #1\n");
++				  exit(109);
++				}
+ 				for (i = 0; i < header_size - 3; i++)
+ 					hdr->name[i] = (char) get_byte();
+ 				hdr->name[header_size - 3] = '\0';
+@@ -547,6 +551,10 @@
+ 				/*
+ 				 * directory
+ 				 */
++				if (header_size >= FILENAME_LENGTH) {
++				  fprintf(stderr, "Possible buffer overflow hack attack, type #2\n");
++				  exit(110);
++				}
+ 				for (i = 0; i < header_size - 3; i++)
+ 					dirname[i] = (char) get_byte();
+ 				dirname[header_size - 3] = '\0';
+--- lha-114i/src/lhext.c.orig	2000-10-04 16:57:38.000000000 +0200
++++ lha-114i/src/lhext.c	2004-04-21 14:30:52.000000000 +0200
+@@ -190,8 +190,13 @@
+ 		q = (char *) rindex(hdr->name, '/') + 1;
+ 	}
+ 	else {
++		if (is_directory_traversal(q)) {
++		  fprintf(stderr, "Possible directory traversal hack attempt in %s\n", q);
++		  exit(111);
++		}
++
+ 		if (*q == '/') {
+-			q++;
++			while (*q == '/') { q++; }
+ 			/*
+ 			 * if OSK then strip device name
+ 			 */
+@@ -419,6 +424,33 @@
+ 	return;
+ }
+ 
++int
++is_directory_traversal(char *string)
++{
++  unsigned int type = 0; /* 0 = new, 1 = only dots, 2 = other chars than dots */
++  char *temp;
++
++  temp = string;
++
++  while (*temp != 0) {
++    if (temp[0] == '/') {
++      if (type == 1) { return 1; }
++      type = 0;
++      temp++;
++      continue;
++    }
++
++    if ((temp[0] == '.') && (type < 2))
++      type = 1;
++    if (temp[0] != '.')
++      type = 2;
++
++    temp++;
++  } /* while */
++
++  return (type == 1);
++}
++
+ /* Local Variables: */
+ /* mode:c */
+ /* tab-width:4 */

Added: trunk/rpms/lha/lha-114i-sec2.patch
===================================================================
--- trunk/rpms/lha/lha-114i-sec2.patch	                        (rev 0)
+++ trunk/rpms/lha/lha-114i-sec2.patch	2007-12-21 13:40:09 UTC (rev 6057)
@@ -0,0 +1,196 @@
+diff -urNp lha-114i.orig/src/lha_macro.h lha-114i/src/lha_macro.h
+--- lha-114i.orig/src/lha_macro.h	2004-08-03 15:53:56.000000000 -0500
++++ lha-114i/src/lha_macro.h	2004-08-03 15:54:05.000000000 -0500
+@@ -53,7 +53,7 @@
+ #define SEEK_SET		0
+ #define SEEK_CUR		1
+ #define SEEK_END		2
+-#endif	/* SEEK_SET
++#endif	/* SEEK_SET */
+ 
+ 
+ /* non-integral functions */
+diff -urNp lha-114i.orig/src/lharc.c lha-114i/src/lharc.c
+--- lha-114i.orig/src/lharc.c	2004-08-03 15:53:56.000000000 -0500
++++ lha-114i/src/lharc.c	2004-08-03 15:54:05.000000000 -0500
+@@ -830,9 +830,10 @@ find_files(name, v_filec, v_filev)
+ 	DIRENTRY       *dp;
+ 	struct stat     tmp_stbuf, arc_stbuf, fil_stbuf;
+ 
+-	strcpy(newname, name);
++	strncpy(newname, name, sizeof(newname));
++	newname[sizeof(newname)-1] = 0;
+ 	len = strlen(name);
+-	if (len > 0 && newname[len - 1] != '/')
++	if (len > 0 && newname[len - 1] != '/' && len < (sizeof(newname)-1))
+ 		newname[len++] = '/';
+ 
+ 	dirp = opendir(name);
+@@ -846,6 +847,11 @@ find_files(name, v_filec, v_filev)
+ 
+ 	for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
+ 		n = NAMLEN(dp);
++		if (len >= (sizeof(newname)-1) ||
++				(len+n) >= (sizeof(newname)-1) ||
++					 n  <= 0                   ||
++				(len+n) <= 0)
++			break;
+ 		strncpy(newname + len, dp->d_name, n);
+ 		newname[len + n] = '\0';
+ 		if (GETSTAT(newname, &fil_stbuf) < 0)
+@@ -903,7 +909,8 @@ build_temporary_name()
+ 		strcpy(temporary_name, TMP_FILENAME_TEMPLATE);
+ 	}
+ 	else {
+-		sprintf(temporary_name, "%s/lhXXXXXX", extract_directory);
++		snprintf(temporary_name, sizeof(temporary_name),
++			"%s/lhXXXXXX", extract_directory);
+ 	}
+ #ifdef MKSTEMP
+ 	mkstemp(temporary_name);
+@@ -913,10 +920,16 @@ build_temporary_name()
+ #else
+ 	char           *p, *s;
+ 
+-	strcpy(temporary_name, archive_name);
++	strncpy(temporary_name, archive_name, sizeof(temporary_name));
++	temporary_name[sizeof(temporary_name)-1] = 0;
+ 	for (p = temporary_name, s = (char *) 0; *p; p++)
+ 		if (*p == '/')
+ 			s = p;
++
++	if( sizeof(temporary_name) - ((size_t) (s-temporary_name)) - 1
++		<= strlen("lhXXXXXX"))
++			exit(-1);
++
+ 	strcpy((s ? s + 1 : temporary_name), "lhXXXXXX");
+ #ifdef MKSTEMP
+ 	mkstemp(temporary_name);
+@@ -1052,7 +1065,8 @@ open_old_archive()
+ 
+ 	if (open_old_archive_1(archive_name, &fp))
+ 		return fp;
+-	sprintf(expanded_archive_name, "%s.lzh", archive_name);
++	snprintf(expanded_archive_name, sizeof(expanded_archive_name),
++		"%s.lzh", archive_name);
+ 	if (open_old_archive_1(expanded_archive_name, &fp)) {
+ 		archive_name = expanded_archive_name;
+ 		return fp;
+@@ -1061,7 +1075,8 @@ open_old_archive()
+ 	 * if ( (errno&0xffff)!=E_PNNF ) { archive_name =
+ 	 * expanded_archive_name; return NULL; }
+ 	 */
+-	sprintf(expanded_archive_name, "%s.lzs", archive_name);
++	snprintf(expanded_archive_name, sizeof(expanded_archive_name),
++		"%s.lzs", archive_name);
+ 	if (open_old_archive_1(expanded_archive_name, &fp)) {
+ 		archive_name = expanded_archive_name;
+ 		return fp;
+diff -urNp lha-114i.orig/src/lhext.c lha-114i/src/lhext.c
+--- lha-114i.orig/src/lhext.c	2004-08-03 15:53:56.000000000 -0500
++++ lha-114i/src/lhext.c	2004-08-03 15:55:40.000000000 -0500
+@@ -82,7 +82,8 @@ make_parent_path(name)
+ 	register char  *p;
+ 
+ 	/* make parent directory name into PATH for recursive call */
+-	strcpy(path, name);
++	memset(path, 0, sizeof(path));
++	strncpy(path, name, sizeof(path)-1);
+ 	for (p = path + strlen(path); p > path; p--)
+ 		if (p[-1] == '/') {
+ 			*--p = '\0';
+@@ -212,9 +213,11 @@ extract_one(afp, hdr)
+ 	}
+ 
+ 	if (extract_directory)
+-		sprintf(name, "%s/%s", extract_directory, q);
+-	else
+-		strcpy(name, q);
++		snprintf(name, sizeof(name), "%s/%s", extract_directory, q);
++	else {
++		strncpy(name, q, sizeof(name));
++		name[sizeof(name) - 1] = '\0';
++	}
+ 
+ 
+ 	/* LZHDIRS_METHOD�����ĥإå��������å����� */
+@@ -335,7 +338,8 @@ extract_one(afp, hdr)
+ 			if ((hdr->unix_mode & UNIX_FILE_TYPEMASK) == UNIX_FILE_SYMLINK) {
+ 				char            buf[256], *bb1, *bb2;
+ 				int             l_code;
+-				strcpy(buf, name);
++				strncpy(buf, name, sizeof(buf));
++				buf[sizeof(buf)-1] = 0;
+ 				bb1 = strtok(buf, "|");
+ 				bb2 = strtok(NULL, "|");
+ 
+@@ -365,9 +369,10 @@ extract_one(afp, hdr)
+ 				if (quiet != TRUE) {
+ 					printf("Symbolic Link %s -> %s\n", bb1, bb2);
+ 				}
+-				strcpy(name, bb1);	/* Symbolic's name set */
++				strncpy(name, bb1, 255);	/* Symbolic's name set */
++				name[255] = 0;
+ #else
+-				sprintf(buf, "%s -> %s", bb1, bb2);
++				sprintf(buf, sizeof(buf), "%s -> %s", bb1, bb2);
+ 				warning("Can't make Symbolic Link", buf);
+ 				return;
+ #endif
+diff -urNp lha-114i.orig/src/lhlist.c lha-114i/src/lhlist.c
+--- lha-114i.orig/src/lhlist.c	2004-08-03 15:53:56.000000000 -0500
++++ lha-114i/src/lhlist.c	2004-08-03 15:54:05.000000000 -0500
+@@ -250,7 +250,8 @@ list_one(hdr)
+ 			printf(" %s", hdr->name);
+ 		else {
+ 			char            buf[256], *b1, *b2;
+-			strcpy(buf, hdr->name);
++			strncpy(buf, hdr->name, sizeof(buf));
++			buf[sizeof(buf)-1] = 0;
+ 			b1 = strtok(buf, "|");
+ 			b2 = strtok(NULL, "|");
+ 			printf(" %s -> %s", b1, b2);
+diff -urNp lha-114i.orig/src/util.c lha-114i/src/util.c
+--- lha-114i.orig/src/util.c	2004-08-03 15:53:56.000000000 -0500
++++ lha-114i/src/util.c	2004-08-03 15:54:05.000000000 -0500
+@@ -276,21 +276,27 @@ rmdir(path)
+ 	char           *path;
+ {
+ 	int             stat, rtn = 0;
+-	char           *cmdname;
+-	if ((cmdname = (char *) malloc(strlen(RMDIRPATH) + 1 + strlen(path) + 1))
+-	    == 0)
++	pid_t           child;
++
++
++	/* XXX thomas: shell meta chars in path could exec commands */
++	/* therefore we should avoid using system() */
++	if ((child = fork()) < 0)
++		return (-1);    /* fork error */
++	else if (child) {       /* parent process */
++		while (child != wait(&stat))    /* ignore signals */
++			continue;
++	}
++	else {                  /* child process */
++		execl(RMDIRPATH, "rmdir", path, (char *) 0);
++		/* never come here except execl is error */
+ 		return (-1);
+-	strcpy(cmdname, RMDIRPATH);
+-	*(cmdname + strlen(RMDIRPATH)) = ' ';
+-	strcpy(cmdname + strlen(RMDIRPATH) + 1, path);
+-	if ((stat = system(cmdname)) < 0)
+-		rtn = -1;	/* fork or exec error */
+-	else if (stat) {	/* RMDIR command error */
+-		errno = EIO;
+-		rtn = -1;
+ 	}
+-	free(cmdname);
+-	return (rtn);
++	if (stat != 0) {
++		errno = EIO;    /* cannot get error num. */
++		return (-1);
++	}
++	return (0);
+ }
+ 
+ /* ------------------------------------------------------------------------ */

Added: trunk/rpms/lha/lha-114i-symlink.patch
===================================================================
--- trunk/rpms/lha/lha-114i-symlink.patch	                        (rev 0)
+++ trunk/rpms/lha/lha-114i-symlink.patch	2007-12-21 13:40:09 UTC (rev 6057)
@@ -0,0 +1,10 @@
+--- lha-114i/src/lhext.c.symlink	2000-10-04 10:57:38.000000000 -0400
++++ lha-114i/src/lhext.c	2003-05-19 22:55:57.000000000 -0400
+@@ -351,6 +351,7 @@ extract_one(afp, hdr)
+ 				}
+ 
+ 				unlink(bb1);
++				make_parent_path(bb1);
+ 				l_code = symlink(bb2, bb1);
+ 				if (l_code < 0) {
+ 					if (quiet != TRUE)

Added: trunk/rpms/lha/lha-dir_length_bounds_check.patch
===================================================================
--- trunk/rpms/lha/lha-dir_length_bounds_check.patch	                        (rev 0)
+++ trunk/rpms/lha/lha-dir_length_bounds_check.patch	2007-12-21 13:40:09 UTC (rev 6057)
@@ -0,0 +1,20 @@
+--- lha-114i.orig/src/header.c	2002-07-19 17:23:58.000000000 +0900
++++ lha-114i/src/header.c	2004-06-16 09:49:23.000000000 +0900
+@@ -648,8 +648,17 @@
+ 	}
+ 
+ 	if (dir_length) {
++		if ((dir_length + name_length) > sizeof(dirname)) {
++			fprintf(stderr, "Insufficient buffer size\n");
++			exit(112);
++		}
+ 		strcat(dirname, hdr->name);
+-		strcpy(hdr->name, dirname);
++
++		if ((dir_length + name_length) > sizeof(hdr->name)) {
++			fprintf(stderr, "Insufficient buffer size\n");
++			exit(112);
++		}
++		strncpy(hdr->name, dirname, sizeof(hdr->name));
+ 		name_length += dir_length;
+ 	}

Added: trunk/rpms/lha/lha.spec
===================================================================
--- trunk/rpms/lha/lha.spec	                        (rev 0)
+++ trunk/rpms/lha/lha.spec	2007-12-21 13:40:09 UTC (rev 6057)
@@ -0,0 +1,59 @@
+# $Id$
+# Authority: dag
+
+# ExclusiveDist: el5
+
+Summary: Archiving and compression utility for LHarc format archives
+Name: lha
+Version: 1.14i
+Release: 19.2.2
+License: freeware
+Group: Applications/Archiving
+URL: http://www2m.biglobe.ne.jp/~dolphin/lha/prog/
+
+Source: http://www2m.biglobe.ne.jp/~dolphin/lha/prog/lha-114i.tar.gz
+Patch: lha-114i-symlink.patch
+Patch1: lha-114i-malloc.patch
+Patch2: lha-114i-sec.patch
+Patch3: lha-dir_length_bounds_check.patch
+Patch4: lha-114i-sec2.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+LHA is an archiving and compression utility for LHarc format archives.
+LHA is mostly used in the DOS world, but can be used under Linux to
+extract DOS files from LHA archives.
+
+Install the lha package if you need to extract DOS files from LHA archives.
+
+%prep
+%setup -n lha-114i
+
+%patch -p1 -b .symlink
+%patch1 -p1 -b .malloc
+
+# security fixes
+%patch2 -p1 -b .sec
+%patch3 -p1 -b .sec
+%patch4 -p1 -b .sec
+
+%build
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -Dp -m0755 src/lha %{buildroot}%{_bindir}/lha
+#%{__install} -Dp -m0644 man/lha.man %{buildroot}%{_mandir}/jp/man1/lha.1
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc CHANGES.euc MACHINES*.euc PROBLEMS.euc README.euc *.txt
+#%doc %{_mandir}/jp/man1/lha.1*
+%{_bindir}/lha
+
+%changelog
+* Mon Apr 30 2007 Dag Wieers <dag at wieers.com> - 1.14i-19.2.2
+- Import from RHEL.

Modified: trunk/rpms/perl-KinoSearch/perl-KinoSearch.spec
===================================================================
--- trunk/rpms/perl-KinoSearch/perl-KinoSearch.spec	2007-12-21 12:02:46 UTC (rev 6056)
+++ trunk/rpms/perl-KinoSearch/perl-KinoSearch.spec	2007-12-21 13:40:09 UTC (rev 6057)
@@ -18,10 +18,11 @@
 Source: http://www.cpan.org/authors/id/C/CR/CREAMYG/KinoSearch-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: perl
+BuildRequires: perl >= 2:5.8.3
 BuildRequires: perl(ExtUtils::CBuilder)
 BuildRequires: perl(ExtUtils::ParseXS)
 BuildRequires: perl(Module::Build)
+Requires: perl >= 2:5.8.3
 
 %description
 Search engine library.

Added: trunk/rpms/php-pear-db/php-pear-db.spec
===================================================================
--- trunk/rpms/php-pear-db/php-pear-db.spec	                        (rev 0)
+++ trunk/rpms/php-pear-db/php-pear-db.spec	2007-12-21 13:40:09 UTC (rev 6057)
@@ -0,0 +1,70 @@
+# $Id$
+# Authority: dag
+
+%define pear_dir %{_datadir}/pear
+%define real_name DB
+
+Summary: PEAR: Database Abstraction Layer
+Name: php-pear-db
+Version: 1.7.13
+Release: 1
+License: PHP
+Group: Development/Libraries
+URL: http://pear.php.net/package/DB
+
+Source: http://pear.php.net/get/%{real_name}-%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch: noarch
+BuildRequires: php >= 4.2.0
+BuildRequires: php-pear
+Requires(post): /usr/bin/pear
+Requires(postun): /usr/bin/pear
+Requires: php >= 4.2.0
+Requires: php-pear
+
+Provides: php-pear(DB) = %{version}
+
+Obsoletes: php-pear-DB <= %{version}-%{release}
+Provides: php-pear-DB = %{version}-%{release}
+
+%description
+DB is a database abstraction layer providing:
+* an OO-style query API
+* portability features that make programs written for one DBMS work with
+  other DBMS's
+* a DSN (data source name) format for specifying database servers
+* prepare/execute (bind) emulation for databases that don't support it natively
+* a result object for each query response
+* portable error codes
+* sequence emulation
+* sequential and non-sequential row fetching as well as bulk fetching
+* formats fetched rows as associative arrays, ordered arrays or objects
+* row limit support
+* transactions support
+* table information interface
+* DocBook and phpDocumentor API documentation
+
+DB layers itself on top of PHP's existing database extensions.
+
+%prep
+
+%build
+
+%install
+%{__rm} -rf %{buildroot}
+/usr/bin/pear install --installroot="%{buildroot}" --nodeps %{SOURCE0}
+
+### Clean up buildroot
+%{__rm} -f %{buildroot}%{pear_dir}/{.filemap,.lock}
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(0644, root, root, 0755)
+%{pear_dir}/
+
+%changelog
+* Thu Dec 20 2007 Dag Wieers <dag at wieers.com> - 1.7.13-1
+- Initial package. (using DAR)


Property changes on: trunk/rpms/php-pear-db/php-pear-db.spec
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: trunk/rpms/unoconv/unoconv.spec
===================================================================
--- trunk/rpms/unoconv/unoconv.spec	2007-12-21 12:02:46 UTC (rev 6056)
+++ trunk/rpms/unoconv/unoconv.spec	2007-12-21 13:40:09 UTC (rev 6057)
@@ -2,14 +2,16 @@
 # Authority: dag
 # Upstream: Dag Wieers <dag$wieers,com>
 
+# ExcludeDist: rh9 el3
+
 %{?dtag: %{expand: %%define %dtag 1}}
 
-%{?el4:%define _with_openoffice.org2 1}
+%{?el4:%define _with_openoffice2 1}
 
 Summary: Tool to convert between any document format supported by OpenOffice
 Name: unoconv
 Version: 0.3
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 URL: http://dag.wieers.com/home-made/unoconv/
@@ -20,8 +22,8 @@
 BuildArch: noarch
 BuildRequires: python >= 2.0
 Requires: python >= 2.0
-%{!?_with_openoffice.org2:Requires:openoffice.org-pyuno >= 2.0}
-%{?_with_openoffice.org2:Requires:openoffice.org2-pyuno >= 2.0}
+%{!?_with_openoffice2:Requires:openoffice.org-pyuno >= 2.0}
+%{?_with_openoffice2:Requires:openoffice.org2-pyuno >= 2.0}
 
 %description
 unoconv converts between any document format that OpenOffice understands.
@@ -52,6 +54,9 @@
 %{_bindir}/unoconv
 
 %changelog
+* Wed Dec 19 2007 Dag Wieers <dag at wieers.com> - 0.3-2
+- Fixed openoffice.org2 dependency on RHEL4.
+
 * Sat Sep 01 2007 Dag Wieers <dag at wieers.com> - 0.3-1
 - Updated to release 0.3.
 

Modified: trunk/rpms/wput/wput.spec
===================================================================
--- trunk/rpms/wput/wput.spec	2007-12-21 12:02:46 UTC (rev 6056)
+++ trunk/rpms/wput/wput.spec	2007-12-21 13:40:09 UTC (rev 6057)
@@ -20,7 +20,7 @@
 with an easy to use command line interface similar to wget's interface.
 
 %prep
-%setup -n wput
+%setup
 
 %build
 %configure
@@ -28,7 +28,8 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1
+%{__install} -d -m0755 %{buildroot}%{_bindir}
+%{__install} -d -m0755 %{buildroot}%{_mandir}/man1
 %{__make} install DESTDIR="%{buildroot}" bindir="%{buildroot}%{_bindir}" mandir="%{buildroot}%{_mandir}/man1/"
 %find_lang %{name}
 



More information about the svn-commits mailing list