Author: qboosh                       Date: Wed Mar  7 17:18:39 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup, separated -static,-dll

---- Files affected:
SPECS:
   crossmingw32-libtiff.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-libtiff.spec
diff -u SPECS/crossmingw32-libtiff.spec:1.2 SPECS/crossmingw32-libtiff.spec:1.3
--- SPECS/crossmingw32-libtiff.spec:1.2 Sun Feb 25 16:05:42 2007
+++ SPECS/crossmingw32-libtiff.spec     Wed Mar  7 18:18:34 2007
@@ -1,105 +1,143 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_without opengl # do not build OpenGL viewer
-#
 Summary:       Library for handling TIFF files - cross Mingw32 version
-Summary(de.UTF-8):Library zum Verwalten von TIFF-Dateien
-Summary(fr.UTF-8):Bibliothèque de gestion des fichiers TIFF - wersja skrośna 
Mingw32
-Summary(pl.UTF-8):Bibliteka do manipulacji plikami w formacie TIFF
-Summary(tr.UTF-8):TIFF dosyalarını işleme kitaplığı
+Summary(pl.UTF-8):     Biblioteka do manipulacji plikami w formacie TIFF - 
wersja skrośna Mingw32
 %define                _realname   libtiff
 Name:          crossmingw32-%{_realname}
 Version:       3.8.2
 Release:       1
 License:       BSD-like
-Group:         Libraries
+Group:         Development/Libraries
 Source0:       ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
 # Source0-md5: fbb6f446ea4ed18955e2714934e5b698
 Patch0:                %{_realname}-sec.patch
 URL:           http://www.remotesensing.org/libtiff/
-%{?with_opengl:BuildRequires:  OpenGL-glut-devel}
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
+BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-libjpeg
 BuildRequires: crossmingw32-zlib
 BuildRequires: libtool
+Requires:      crossmingw32-libjpeg
+Requires:      crossmingw32-zlib
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _noautoreqdep   libGL.so.1 libGLU.so.1
-
 %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                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
-%define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
+%define                _dlldir                 /usr/share/windows/wine/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
 
 %description
-This package is a library of functions that manipulate TIFF images.
-
-%description -l de.UTF-8
-Eine Library von Funktionen zur Manipulation von TIFFs.
-
-%description -l fr.UTF-8
-Bibliothèque de fonctions pour manipuler des images TIFF.
+This package is a library of functions that manipulate TIFF images
+(cross mingw32 version).
 
 %description -l pl.UTF-8
 Ten pakiet zawiera bibliotekę pozwalającą manipulować plikami w
-formacie TIFF.
+formacie TIFF (w wersji skrośnej mingw32).
+
+%package static
+Summary:       Static libtiff library (cross mingw32 version)
+Summary(pl.UTF-8):     Statyczna biblioteka libtiff (wersja skrośna mingw32)
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description static
+Static libtiff library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libtiff (wersja skrośna mingw32).
 
-%description -l tr.UTF-8
-Bu paket TIFF resimlerini işleyen fonksiyonlardan oluşan bir
-kitaplıktır.
+%package dll
+Summary:       DLL libtiff library for Windows
+Summary(pl.UTF-8):     Biblioteka DLL libtiff dla Windows
+Group:         Applications/Emulators
+Requires:      wine
+Requires:      crossmingw32-libjpeg-dll
+Requires:      crossmingw32-zlib-dll
+
+%description dll
+DLL libtiff library for Windows.
+
+%description dll -l pl.UTF-8
+Biblioteka DLL libtiff dla Windows.
 
 %package cxx
-Summary:       libtiff C++ streams library
-Summary(pl.UTF-8):Biblioteka strumieni C++ dla libtiff
-Group:         Libraries
+Summary:       libtiff C++ streams library (cross mingw32 version)
+Summary(pl.UTF-8):     Biblioteka strumieni C++ dla libtiff (wersja skrośna 
mingw32)
+Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description cxx
-libtiff C++ streams library.
+libtiff C++ streams library (cross mingw32 version).
 
 %description cxx -l pl.UTF-8
-Biblioteka strumieni C++ dla libtiff.
+Biblioteka strumieni C++ dla libtiff (wersja skrośna mingw32).
+
+%package cxx-static
+Summary:       Static libtiff C++ streams library (cross mingw32 version)
+Summary(pl.UTF-8):     Statyczna biblioteka strumieni C++ dla libtiff (wersja 
skrośna mingw32)
+Group:         Development/Libraries
+Requires:      %{name}-cxx = %{version}-%{release}
+
+%description cxx-static
+Static libtiff C++ streams library (cross mingw32 version).
+
+%description cxx-static -l pl.UTF-8
+Statyczna biblioteka strumieni C++ dla libtiff (wersja skrośna
+mingw32).
+
+%package cxx-dll
+Summary:       DLL libtiff C++ streams library for Windows
+Summary(pl.UTF-8):     Biblioteka DLL strumieni C++ libtiff dla Windows
+Group:         Applications/Emulators
+Requires:      %{name}-dll = %{version}-%{release}
+
+%description cxx-dll
+DLL libtiff C++ streams library for Windows.
+
+%description cxx-dll -l pl.UTF-8
+Biblioteka DLL strumieni C++ libtiff dla Windows.
 
 %prep
 %setup -q -n tiff-%{version}
-
 %patch0 -p1
 
 rm -f m4/{libtool,lt*}.m4
 
 %build
-export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+       lt_cv_deplibs_check_method=pass_all \
        --target=%{target} \
        --host=%{target} \
        --enable-static
-%{__sed} -i -e 's/^deplibs_check_method=.*/deplibs_check_method="pass_all"/' 
libtool
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d 
$RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_bindir},%{_mandir}/man1}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf html{,/*}/Makefile* $RPM_BUILD_ROOT%{_docdir}/tiff-%{version}
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%if 0%{!?debug:1}
+%{target}-strip --strip-unneeded -R.comment -R.note 
$RPM_BUILD_ROOT%{_dlldir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
+%endif
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/{doc,man}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,26 +145,43 @@
 %files
 %defattr(644,root,root,755)
 %doc COPYRIGHT ChangeLog README TODO
+%{_libdir}/libtiff.dll.a
 %{_libdir}/libtiff.la
-%{_libdir}/libtiff*.a
-%{_bindir}/*.dll
 %{_includedir}/tiff*.h
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libtiff.a
+
+%files dll
+%defattr(644,root,root,755)
+%{_dlldir}/libtiff-*.dll
+
 %files cxx
 %defattr(644,root,root,755)
+%{_libdir}/libtiffxx.dll.a
 %{_libdir}/libtiffxx.la
-%{_libdir}/libtiffxx*.a
 %{_includedir}/tiffio.hxx
 
+%files cxx-static
+%defattr(644,root,root,755)
+%{_libdir}/libtiffxx.a
+
+%files cxx-dll
+%defattr(644,root,root,755)
+%{_dlldir}/libtiffxx-*.dll
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[EMAIL PROTECTED]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007/03/07 17:18:34  qboosh
+- cleanup, separated -static,-dll
+
 Revision 1.2  2007/02/25 15:05:42  czarny
 - shared + static build
 
 Revision 1.1  2007/02/20 23:27:38  czarny
 - initial based on libtiff.spec
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/crossmingw32-libtiff.spec?r1=1.2&r2=1.3&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to