--- wxGTK.spec.old 2005-01-18 01:38:51 +0300 +++ wxGTK.spec 2005-07-26 15:51:42 +0400 @@ -9,7 +9,7 @@ Name: wxGTK%ucode Version: %wxbranch.2 -Release: alt3.1 +Release: alt3.2 Serial: 1 Summary: The GTK+ port of the wxWidgets library @@ -22,8 +22,10 @@ %if "%wxbranch" < "2.5" Patch1: wxGTK-2.4.1-alt-fonts.patch Patch2: wxGTK-2.4.2-alt-contribs_for_compile.patch +Patch3: wxGTK-2.4.2-alt-contrib_utils.patch %else Patch1: wxGTK-2.5.2-alt-contribs_for_compile.patch +Patch2: wxGTK-2.5.2-alt-contrib_utils.patch %endif Provides: wxwin @@ -103,9 +105,18 @@ Requires: %name = %version Obsoletes: wxGTK-contrib-xrc +%package contrib-utils +Summary: wxWidgets XML Resources +Group: System/Libraries +Requires: %name = %version +Obsoletes: wxGTK-contrib-xrc + %description contrib-xrc wxWidgets XML Resources. +%description contrib-utils +Some utils for wxGTK + %package contrib-xrc-devel Summary: Development files for wxWidgets XML Resources Group: Development/C++ @@ -124,8 +135,9 @@ %prep %setup -q -n wxGTK-%version %patch1 -p1 -%if "%wxbranch" < "2.5" %patch2 -p1 +%if "%wxbranch" < "2.5" +%patch3 -p1 %endif %__subst 's/wxstd/wxstd%ucode/' src/common/intl.cpp %__subst 's/wxstd/wxstd%ucode/' locale/Makefile @@ -148,6 +160,8 @@ %make_build cd contrib/src %make_build +cd ../utils +%make_build %install %makeinstall @@ -164,6 +178,9 @@ cd contrib/src %makeinstall +cd ../utils +%__install -p -m644 -D wxrc/wxrc %buildroot%_bindir/wxrc +%__install -p -m644 -D wxrcedit/wxrcedit %buildroot%_bindir/wxrcedit %post -p %post_ldconfig %postun -p %postun_ldconfig @@ -210,11 +227,17 @@ %files contrib-xrc %_libdir/libwx_gtk%{ucode}_xrc-%wxbranch.so.* +%files contrib-utils +%_bindir/* + %files contrib-xrc-devel %_libdir/libwx_gtk%{ucode}_xrc-%wxbranch.so %_includedir/wx/xrc %changelog +* Tue Jul 28 2005 Sergei Epiphanov 1:2.4.2-alt3.2 +- Add contrib-utils package + * Tue Jan 18 2005 ALT QA Team Robot 1:2.4.2-alt3.1 - Rebuilt with libstdc++.so.6.