[EmfEngine] move header file to %{_includedir}

Chen Lei supercyper at fedoraproject.org
Sat Sep 11 02:43:29 UTC 2010


commit 65a98a91638e09c8f37ba75a52167d6c205ff561
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Sep 11 10:42:52 2010 +0800

    move header file to %{_includedir}

 EmfEngine-0.8-path.patch |    2 +-
 EmfEngine.spec           |   24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/EmfEngine-0.8-path.patch b/EmfEngine-0.8-path.patch
index dd57f06..71297f3 100644
--- a/EmfEngine-0.8-path.patch
+++ b/EmfEngine-0.8-path.patch
@@ -16,7 +16,7 @@
 +INSTALLBASE = /usr
 +
 +target.path = $$LIBDIR
-+headers.path = $$INSTALLBASE/include/QTeXEngine
++headers.path = $$INSTALLBASE/include
 +
 +headers.files = $$HEADERS
 +INSTALLS = target headers
diff --git a/EmfEngine.spec b/EmfEngine.spec
index ca7423f..71211b1 100644
--- a/EmfEngine.spec
+++ b/EmfEngine.spec
@@ -1,6 +1,6 @@
 Name:		EmfEngine
 Version:	0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Library enabling Qt based applications to export graphics to the EMF format
 License:	GPLv3
 Group:		System Environment/Libraries
@@ -29,14 +29,14 @@ Requires:	libEMF-devel%{?_isa}
 Requires:	qt4-devel%{?_isa}
 
 %description devel
-The %{name}-devel package contains libraries, header files and
-documentation for developing applications that use %{name}.
+The %{name}-devel package contains library, header file and documentation
+for developing applications that use %{name}.
 
 %prep
 %setup -q -n %{name}
 %patch0 -p1
 
-#fix source files for debug package
+# Remove DOS line endings
 find -type f -exec dos2unix -k {} ";"
 
 %build
@@ -44,14 +44,11 @@ export PATH=%{_qt4_bindir}:$PATH
 pushd src
 %{_qt4_qmake} CONFIG+=EmfEngineDll LIBS+=-lEMF \
 	INCLUDEPATH+=%{_includedir}/libEMF LIBDIR=%{_libdir}
-make %{?_smp_mflags}
 popd
+make %{?_smp_mflags} -C src
 
 %install
-pushd src
-make install INSTALL="install -p" INSTALL_ROOT=%{buildroot}
-make %{?_smp_mflags}
-popd
+make install INSTALL="install -p" INSTALL_ROOT=%{buildroot} -C src
 
 %post -p /sbin/ldconfig
 
@@ -63,14 +60,17 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc *.txt
-%{_libdir}/*.so.*
+%{_libdir}/libEmfEngine.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc example
-%{_includedir}/*
-%{_libdir}/*.so
+%{_includedir}/EmfEngine.h
+%{_libdir}/libEmfEngine.so
 
 %changelog
+* Fri Sep 10 2010 Chen Lei <supercyper at 163.com> - 0.8-2
+- move header file to %%{_includedir}
+
 * Mon Jul 26 2010 Chen Lei <supercyper at 163.com> - 0.8-1
 - initial rpm build


More information about the scm-commits mailing list