Compare commits

...

4 Commits
master ... f8

Author SHA1 Message Date
Fedora Release Engineering 6ab2752753 dist-git conversion 2010-07-28 20:38:32 +00:00
Bill Nottingham 1597f4fdc7 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:46:56 +00:00
Dominik Mierzejewski f7afcec3d0 - fixed compilation on Alpha platform (patch by Oliver Falk) 2007-12-03 22:04:25 +00:00
Jesse Keating 96d9bca9cb Initialize branch F-8 for libEMF 2007-10-20 23:07:50 +00:00
4 changed files with 18 additions and 22 deletions

View File

View File

@ -1,21 +0,0 @@
# Makefile for source rpm: libEMF
# $Id$
NAME := libEMF
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

12
libEMF-axp.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up libEMF-1.0.3/include/libEMF/wine/winnt.h.axp libEMF-1.0.3/include/libEMF/wine/winnt.h
--- libEMF-1.0.3/include/libEMF/wine/winnt.h.axp 2007-12-03 22:35:49.000000000 +0100
+++ libEMF-1.0.3/include/libEMF/wine/winnt.h 2007-12-03 22:37:10.000000000 +0100
@@ -671,7 +671,7 @@ typedef struct _CONTEXT CONTEXT;
#endif
/* Alpha context definitions */
-#ifdef _ALPHA_
+#if defined(__alpha__)
#define CONTEXT_ALPHA 0x00020000

View File

@ -2,12 +2,13 @@ Summary: A library for generating Enhanced Metafiles
Summary(pl): Biblioteka do generowania plików w formacie Enhanced Metafile
Name: libEMF
Version: 1.0.3
Release: 4%{?dist}
Release: 5%{?dist}
License: LGPLv2+ and GPLv2+
Group: System Environment/Libraries
Source0: http://dl.sourceforge.net/pstoedit/%{name}-%{version}.tar.gz
# Source0-md5: a4e91fd8077ce5f540f569e20e8ef7ff
Patch0: %{name}-amd64.patch
Patch1: %{name}-axp.patch
URL: http://libemf.sourceforge.net/
BuildRequires: libstdc++-devel
BuildRequires: libtool
@ -43,6 +44,7 @@ Pliki nagłówkowe libEMF.
%prep
%setup -q
%patch0 -p1 -b .amd64
%patch1 -p1 -b .axp
chmod 0644 libemf/libemf.h
%build
@ -88,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/libEMF
%changelog
* Mon Dec 03 2007 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> 1.0.3-5
- fixed compilation on Alpha platform (patch by Oliver Falk)
* Sat Aug 25 2007 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> 1.0.3-4
- rebuild for BuildID
- update license tag