Author: czarny Date: Sun Feb 25 15:04:02 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- shared + static build
- configure used for .la and .pc files
---- Files affected:
SPECS:
crossmingw32-libpng.spec (1.16 -> 1.17)
---- Diffs:
================================================================
Index: SPECS/crossmingw32-libpng.spec
diff -u SPECS/crossmingw32-libpng.spec:1.16 SPECS/crossmingw32-libpng.spec:1.17
--- SPECS/crossmingw32-libpng.spec:1.16 Mon Feb 12 22:23:51 2007
+++ SPECS/crossmingw32-libpng.spec Sun Feb 25 16:03:54 2007
@@ -24,14 +24,17 @@
%define no_install_post_strip 1
-%define target i386-mingw32
-%define target_platform i386-pc-mingw32
-%define arch %{_prefix}/%{target}
-%define gccarch %{_prefix}/lib/gcc-lib/%{target}
-%define gcclib
%{_prefix}/lib/gcc-lib/%{target}/%{version}
-
-%define __cc %{target}-gcc
-%define __cxx %{target}-g++
+%define target i386-mingw32
+%define target_platform i386-pc-mingw32
+%define arch %{_prefix}/%{target}
+%define gccarch %{_prefix}/lib/gcc-lib/%{target}
+%define gcclib
%{_prefix}/lib/gcc-lib/%{target}/%{version}
+
+%define _sysprefix /usr
+%define _prefix %{_sysprefix}/%{target}
+%define _pkgconfigdir %{_prefix}/lib/pkgconfig
+%define __cc %{target}-gcc
+%define __cxx %{target}-g++
%ifarch alpha sparc sparc64 sparcv9
%define optflags -O2
@@ -47,16 +50,16 @@
plikami w formacie graficznym PNG. Format ten został stworzony jako
zamiennik dla formatu GIF, z wieloma rozszerzeniami i nowościami.
-%package dll
-Summary: libpng - DLL library for Windows
-Summary(pl.UTF-8): libpng - biblioteka DLL dla Windows
-Group: Applications/Emulators
-
-%description dll
-libpng - DLL library for Windows.
-
-%description dll -l pl.UTF-8
-libpng - biblioteka DLL dla Windows.
+#%package dll
+#Summary: libpng - DLL library for Windows
+#Summary(pl.UTF-8): libpng - biblioteka DLL dla Windows
+#Group: Applications/Emulators
+#
+#%description dll
+#libpng - DLL library for Windows.
+#
+#%description dll -l pl.UTF-8
+#libpng - biblioteka DLL dla Windows.
%prep
%setup -q -n %{realname}-%{version}
@@ -71,38 +74,51 @@
%patch5 -p1
%build
-%{__make} \
- prefix=%{_arch} \
- LIBPATH=%{_arch}/lib \
- CC="%{target}-gcc" \
- RANLIB="%{target}-ranlib"
- OPT_FLAGS="%{rpmcflags}"
+#%{__make} \
+# prefix=%{_arch} \
+# LIBPATH=%{_arch}/lib \
+# CC="%{target}-gcc" \
+# RANLIB="%{target}-ranlib" \
+# OPT_FLAGS="%{rpmcflags}" \
+# LDFLAGS="-static %{rpmldflags}"
+%configure \
+ --target=%{target} \
+ --host=%{target} \
+ --with-pkgconfigdir=%{_pkgconfigdir}
+
+%{__make}
%if 0%{!?debug:1}
-%{target}-strip -R.comment -R.note *.dll
-%{target}-strip -g -R.comment -R.note *.a
+%{target}-strip -R.comment -R.note .libs/*.dll
+%{target}-strip -g -R.comment -R.note .libs/*.a
%endif
%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{arch}/{include,lib}
-install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
-
-install *.a $RPM_BUILD_ROOT%{arch}/lib
-install png.h pngconf.h $RPM_BUILD_ROOT%{arch}/include
-install *.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+#rm -rf $RPM_BUILD_ROOT
+#install -d $RPM_BUILD_ROOT%{arch}/{include,lib}
+# install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+#
+#install *.a $RPM_BUILD_ROOT%{arch}/lib
+#install png.h pngconf.h $RPM_BUILD_ROOT%{arch}/include
+#install *.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%{arch}/include/*
-%{arch}/lib/*
-
-%files dll
-%defattr(644,root,root,755)
-%{_datadir}/wine/windows/system/*.dll
+%dir %{_includedir}/libpng12
+%{_includedir}/libpng12/*
+%{_libdir}/*.la
+%{_libdir}/*.a
+%{_bindir}/*.dll
+%{_pkgconfigdir}/*.pc
+
+#%files dll
+#%defattr(644,root,root,755)
+#%{_datadir}/wine/windows/system/*.dll
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -110,6 +126,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2007/02/25 15:03:54 czarny
+- shared + static build
+- configure used for .la and .pc files
+
Revision 1.16 2007/02/12 21:23:51 glen
- tabs in preamble
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/crossmingw32-libpng.spec?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
