- cleanup, separated -static,-dll

  (blindly, as cross libglade2 spec is missing)

Changed files:
    crossmingw32-libglademm.spec -> 1.2

diff --git a/crossmingw32-libglademm.spec b/crossmingw32-libglademm.spec
index 5c343bdc8fdf63c4da3a5b8dc6b776f888ca9e29..0aeb367b5924c270734f17ff82f348db7312a882 100644 (file)
--- a/crossmingw32-libglademm.spec
+++ b/crossmingw32-libglademm.spec
@@ -1,11 +1,11 @@
-Summary:       C++ wrappers for libglade
-Summary(pl.UTF-8):Interfejsy C++ dla libglade
+Summary:       C++ wrappers for libglade (cross mingw32 version)
+Summary(pl.UTF-8):     Interfejsy C++ dla libglade (wersja skrośna mingw32)

 %define                _realname   libglademm
 Name:          crossmingw32-%{_realname}
 Version:       2.6.3
 Release:       1
 License:       GPL
 %define                _realname   libglademm
 Name:          crossmingw32-%{_realname}
 Version:       2.6.3
 Release:       1
 License:       GPL

-Group:         Libraries
+Group:         Development/Libraries

 Source0:       http://ftp.gnome.org/pub/gnome/sources/libglademm/2.6/%{_realname}-%{version}.tar.bz2
 # Source0-md5: 3dd3c3777c4407b8a330bd79089ddbfc
 URL:           http://www.gnome.org/
 Source0:       http://ftp.gnome.org/pub/gnome/sources/libglademm/2.6/%{_realname}-%{version}.tar.bz2
 # Source0-md5: 3dd3c3777c4407b8a330bd79089ddbfc
 URL:           http://www.gnome.org/


@@ -13,9 +13,11 @@ BuildRequires:       autoconf
 BuildRequires: automake
 BuildRequires: crossmingw32-gtkmm >= 2.10.0
 BuildRequires: crossmingw32-libglade2 >= 2.6.0
 BuildRequires: automake
 BuildRequires: crossmingw32-gtkmm >= 2.10.0
 BuildRequires: crossmingw32-libglade2 >= 2.6.0

-BuildRequires: crossmingw32-pkgconfig

 BuildRequires: libtool >= 2:1.4d
 BuildRequires: perl-base
 BuildRequires: libtool >= 2:1.4d
 BuildRequires: perl-base

+BuildRequires: pkgconfig
+Requires:      crossmingw32-gtkmm >= 2.10.0
+Requires:      crossmingw32-libglade2 >= 2.6.0

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1


@@ -23,20 +25,45 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                target                  i386-mingw32
 %define                target_platform         i386-pc-mingw32
 %define                arch                    %{_prefix}/%{target}
 %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                _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++
 
 %description
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
 
 %description

-C++ wrappers for libglade.
+C++ wrappers for libglade (cross mingw32 version).

 
 %description -l pl.UTF-8
 
 %description -l pl.UTF-8

-Interfejsy C++ dla libglade.
+Interfejsy C++ dla libglade (wersja skrośna mingw32).
+
+%package static
+Summary:       Static libglademm library (cross mingw32 version)
+Summary(pl.UTF-8):     Statyczna biblioteka libglademm (wersja skrośna mingw32)
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description static
+Static libglademm library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libglademm (wersja skrośna mingw32).
+
+%package dll
+Summary:       DLL libglademm library for Windows
+Summary(pl.UTF-8):     Biblioteka DLL libglademm dla Windows
+Group:         Applications/Emulators
+Requires:      crossmingw32-gtkmm-dll >= 2.10.0
+Requires:      crossmingw32-libglade2-dll >= 2.6.0
+Requires:      wine
+
+%description dll
+DLL libglademm library for Windows.
+
+%description dll -l pl.UTF-8
+Biblioteka DLL libglademm dla Windows.

 
 %prep
 %setup -q -n %{_realname}-%{version}
 
 %prep
 %setup -q -n %{_realname}-%{version}


@@ -60,15 +87,32 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 

+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%{_libdir}/libglademm-2.4/proc
+

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS

-%{_libdir}/libglademm*.la
-%{_libdir}/libglademm*.a
-%{_bindir}/libglademm*.dll
+%{_libdir}/libglademm-2.4.la
+%{_libdir}/libglademm-2.4.dll.a

 %{_includedir}/%{_realname}-2.4
 %{_libdir}/%{_realname}-2.4
 %{_pkgconfigdir}/%{_realname}-2.4.pc
 %{_includedir}/%{_realname}-2.4
 %{_libdir}/%{_realname}-2.4
 %{_pkgconfigdir}/%{_realname}-2.4.pc

+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libglademm-2.4.a
+
+%files dll
+%defattr(644,root,root,755)
+%{_dlldir}/libglademm*-2.4-*.dll