Author: qboosh                       Date: Wed Mar  7 00:04:13 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup, separated -static

---- Files affected:
SPECS:
   crossmingw32-libjpeg.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-libjpeg.spec
diff -u SPECS/crossmingw32-libjpeg.spec:1.10 
SPECS/crossmingw32-libjpeg.spec:1.11
--- SPECS/crossmingw32-libjpeg.spec:1.10        Sun Feb 25 16:04:36 2007
+++ SPECS/crossmingw32-libjpeg.spec     Wed Mar  7 01:04:07 2007
@@ -6,7 +6,7 @@
 Version:       6b
 Release:       5
 License:       distributable
-Group:         Libraries
+Group:         Development/Libraries
 Source0:       ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
 # Source0-md5: dbd5f3b47ed13132f04c685d608a7547
 Patch0:                %{realname}-DESTDIR.patch
@@ -14,10 +14,8 @@
 Patch2:                %{realname}-c++.patch
 Patch3:                %{name}-shared.patch
 URL:           http://www.ijg.org/
-Requires:      crossmingw32-runtime
 BuildRequires: crossmingw32-gcc
-BuildRequires: crossmingw32-w32api
-BuildRequires: libtool
+Requires:      crossmingw32-runtime
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
@@ -25,12 +23,10 @@
 %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/wine/windows/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
 
@@ -42,13 +38,30 @@
 The libjpeg package contains a library of functions for manipulating
 JPEG images.
 
+This package contains the cross version for Win32.
+
 %description -l pl.UTF-8
 Ten pakiet zawiera bibliotekę funkcji do manipulacji plikami jpeg.
 
+Ten pakiet zawiera wersję skrośną dla Win32.
+
+%package static
+Summary:       Static libjpeg library (cross mingw32 version)
+Summary(pl.UTF-8):     Statyczna biblioteka libjpeg (wersja skrośna mingw32)
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description static
+Static libjpeg library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libjpeg (wersja skrośna mingw32).
+
 %package dll
 Summary:       libjpeg - DLL library for Windows
 Summary(pl.UTF-8):     libjpeg - biblioteka DLL dla Windows
 Group:         Applications/Emulators
+Requires:      wine
 
 %description dll
 libjpeg - DLL library for Windows.
@@ -138,13 +151,17 @@
 
 %files
 %defattr(644,root,root,755)
+%{_libdir}/libjpeg.dll.a
+%{_libdir}/libjpeg.la
 %{_includedir}/*.h
-%{_libdir}/*.la
-%{_libdir}/*.a
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libjpeg.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_bindir}/*.dll
+%{_bindir}/libjpeg.dll
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -152,6 +169,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2007/03/07 00:04:07  qboosh
+- cleanup, separated -static
+
 Revision 1.10  2007/02/25 15:04:36  czarny
 - shared + static build
 - custom made .la file
@@ -183,4 +203,3 @@
 
 Revision 1.1  2003/12/23 19:40:11  wolf
 - new
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/crossmingw32-libjpeg.spec?r1=1.10&r2=1.11&f=u

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

Reply via email to