rpms/dx/devel dx-open.patch,NONE,1.1 dx.spec,1.4,1.5
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Sat Aug 18 00:00:05 UTC 2007
Author: rathann
Update of /cvs/pkgs/rpms/dx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1427
Modified Files:
dx.spec
Added Files:
dx-open.patch
Log Message:
- fix open() invocation with O_CREAT and no mode
- update License: in accordance with latest guidelines
- sync with F-7
dx-open.patch:
--- NEW FILE dx-open.patch ---
--- dx-4.4.4/src/exec/libdx/fileio.c.open 2006-01-05 23:55:47.000000000 +0100
+++ dx-4.4.4/src/exec/libdx/fileio.c 2007-08-17 18:43:14.000000000 +0200
@@ -263,7 +263,7 @@ Error _dxffile_open(char *name, int rw)
case 2:/* read/write */
fd = open(name, O_RDWR);
if (fd < 0) {
- fd = open(name, O_WRONLY | O_CREAT);
+ fd = open(name, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
if (fd < 0) {
DXSetError(ERROR_DATA_INVALID,
"can't open/create file '%s'", name);
--- dx-4.4.4/src/exec/libdx/plock.c.open 2002-07-17 06:48:18.000000000 +0200
+++ dx-4.4.4/src/exec/libdx/plock.c 2007-08-17 19:05:14.000000000 +0200
@@ -37,7 +37,8 @@ struct seminfo *__buf; /* buffer fo
#define SEM_FLAGS (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
#define SHM_FLAGS (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
-#define OPEN_FLAGS (O_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+#define OPEN_FLAGS (O_CREAT)
+#define OPEN_MODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
#define IS_MINE(a) (locks->_owner[a] == getpid())
#define SET_OWNER(a) (locks->_owner[a] = getpid())
#define CLEAR_OWNER(a) (locks->_owner[a] = 0)
@@ -268,7 +269,7 @@ PLockInit()
if (stat(LOCKFILE, &statbuf))
{
- int fd = open(LOCKFILE, OPEN_FLAGS);
+ int fd = open(LOCKFILE, OPEN_FLAGS, OPEN_MODE);
if (fd < 0)
{
fprintf(stderr, "initLocks: error accessing locks shared block: open\n");
Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dx.spec 27 Sep 2006 08:44:03 -0000 1.4
+++ dx.spec 17 Aug 2007 23:59:32 -0000 1.5
@@ -1,16 +1,15 @@
Summary: Open source version of IBM's Visualization Data Explorer
Name: dx
Version: 4.4.4
-Release: 2%{?dist}
+Release: 4%{?dist}
URL: http://www.opendx.org/
Group: Applications/Engineering
Source0: http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
Patch0: %{name}-rpm.patch
-License: IBM Public License
+Patch1: %{name}-open.patch
+License: IBM
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf
-BuildRequires: automake
BuildRequires: bison
BuildRequires: desktop-file-utils
BuildRequires: flex
@@ -47,6 +46,9 @@
%prep
%setup -q
%patch0 -p1 -b .r
+%patch1 -p1 -b .open
+# fix debuginfo rpmlint warnings
+chmod a-x src/exec/{dxmods,dpexec,hwrender}/*.{c,h}
%build
autoreconf --force --install
@@ -70,7 +72,8 @@
mv $RPM_BUILD_ROOT%{_libdir}/arch.mak $RPM_BUILD_ROOT%{_includedir}/dx/
-install -Dp -m644 src/uipp/ui/icon50.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/dx.xpm
+install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
+sed -e 's/"R. c #b4b4b4",/"R. c none",/' src/uipp/ui/icon50.xpm > $RPM_BUILD_ROOT%{_datadir}/pixmaps/dx.xpm
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category X-Fedora \
@@ -78,7 +81,8 @@
# cleanup buildroot
rm -rf $RPM_BUILD_ROOT%{_datadir}/dx/doc
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_datadir}/dx/lib/outboard.c
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -105,6 +109,16 @@
%{_libdir}/lib*.so
%changelog
+* Fri Aug 17 2007 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-4
+- fix open() invocation with O_CREAT and no mode
+- update License: in accordance with latest guidelines
+
+* Wed Jul 04 2007 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-3
+- rebuild against new netcdf shared libs
+- fix menu icon transparency (#207841)
+- drop redundant BRs
+- fix some rpmlint warnings
+
* Wed Sep 27 2006 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-2
- rebuild against lesstif
More information about the scm-commits
mailing list