|
@@ -3,32 +3,18 @@
|
|
Summary: A version of the MIT Athena widget set for X.
|
|
Summary: A version of the MIT Athena widget set for X.
|
|
Summary(ja): X 用 MIT Athena widget の 3D 風バージョン
|
|
Summary(ja): X 用 MIT Athena widget の 3D 風バージョン
|
|
Name: Xaw3d
|
|
Name: Xaw3d
|
|
-Version: 1.5E
|
|
|
|
-Release: 6%{?_dist_release}
|
|
|
|
|
|
+Version: 1.6.2
|
|
|
|
+Release: 1%{?_dist_release}
|
|
Group: System Environment/Libraries
|
|
Group: System Environment/Libraries
|
|
-Source: ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-%{version}.tar.gz
|
|
|
|
-Source1: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6/Xaw3d-1.3.tar.gz
|
|
|
|
-Source2: Imakefile
|
|
|
|
-URL: ftp://ftp.visi.com/users/hawkeyd/X/
|
|
|
|
-
|
|
|
|
-# patch for compat libraries
|
|
|
|
-Patch0: Xaw3d-1.1-shlib.patch
|
|
|
|
-Patch1: Xaw3d-1.3-glibc.patch
|
|
|
|
-Patch2: Xaw3d-1.3-X11R6.3.patch
|
|
|
|
-Patch3: xaw3d.patch
|
|
|
|
-Patch4: Xaw3d-1.3-static.patch
|
|
|
|
-Patch5: Xaw3d-ia64.patch
|
|
|
|
-Patch6: Xaw3d-1.5-i18n.patch
|
|
|
|
-Patch7: Xaw3d-1.5-color.patch
|
|
|
|
-Patch8: Xaw3d-1.5-troughColor.patch
|
|
|
|
-Patch9: Xaw3d-1.3-misc.patch
|
|
|
|
-Patch10: Xaw3d-1.5-scrollbar2.patch
|
|
|
|
-
|
|
|
|
-# patch for current libraries
|
|
|
|
-Patch50: Xaw3d-1.5E-xorg-imake.patch
|
|
|
|
|
|
+Source: http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2
|
|
|
|
+URL: http://xorg.freedesktop.org/
|
|
|
|
+
|
|
|
|
+# patch from fedora
|
|
|
|
+Patch7: Xaw3d-1.6.1-3Dlabel.patch
|
|
|
|
+Patch10: Xaw3d-1.6.1-fontset.patch
|
|
|
|
+Patch11: Xaw3d-1.6.1-hsbar.patch
|
|
|
|
|
|
License: MIT
|
|
License: MIT
|
|
-Prereq: fileutils
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRequires: libXmu-devel
|
|
BuildRequires: libXmu-devel
|
|
BuildRequires: libXt-devel
|
|
BuildRequires: libXt-devel
|
|
@@ -36,7 +22,6 @@ BuildRequires: libSM-devel
|
|
BuildRequires: libXext-devel
|
|
BuildRequires: libXext-devel
|
|
BuildRequires: libX11-devel
|
|
BuildRequires: libX11-devel
|
|
BuildRequires: libXpm-devel
|
|
BuildRequires: libXpm-devel
|
|
-BuildRequires: imake
|
|
|
|
BuildRequires: bison
|
|
BuildRequires: bison
|
|
BuildRequires: flex
|
|
BuildRequires: flex
|
|
BuildRequires: ed
|
|
BuildRequires: ed
|
|
@@ -120,74 +105,25 @@ Xaw3d-devel パッケージをインストールして下さい.
|
|
同時に Xaw3d もインストールしておく必要があります.
|
|
同時に Xaw3d もインストールしておく必要があります.
|
|
|
|
|
|
%prep
|
|
%prep
|
|
-%setup -q -c
|
|
|
|
-
|
|
|
|
-# Xaw3d7
|
|
|
|
-pushd xc/lib/Xaw3d
|
|
|
|
-ln -s .. X11
|
|
|
|
-%patch50 -p0 -b .config
|
|
|
|
-popd
|
|
|
|
-
|
|
|
|
-# Xaw3d6 (compat libs)
|
|
|
|
-%if %{compatlib}
|
|
|
|
-%ifnarch ia64
|
|
|
|
-mkdir old
|
|
|
|
-pushd old
|
|
|
|
-tar xzf %{SOURCE1}
|
|
|
|
-popd
|
|
|
|
-mv old/xc/lib/Xaw3d xc/lib/Xaw3d6
|
|
|
|
-rm -rf old
|
|
|
|
-pushd xc/lib/Xaw3d6
|
|
|
|
-%patch0 -p0
|
|
|
|
-ln -s .. X11
|
|
|
|
-%patch1 -p4
|
|
|
|
-%patch2 -p3
|
|
|
|
-%patch3 -p4
|
|
|
|
-%patch4 -p0
|
|
|
|
-%patch6 -p4
|
|
|
|
-%patch7 -p3
|
|
|
|
-#%patch8 -p3
|
|
|
|
-%patch9 -p3
|
|
|
|
-#%patch10 -p4
|
|
|
|
-popd
|
|
|
|
-%endif
|
|
|
|
-%endif
|
|
|
|
|
|
+%setup -q -n libXaw3d-%{version}
|
|
|
|
+%patch7 -p1 -b .3Dlabel
|
|
|
|
+%patch10 -p1 -b .fontset
|
|
|
|
+%patch11 -p1 -b .hsbar
|
|
|
|
|
|
%build
|
|
%build
|
|
|
|
+%configure \
|
|
|
|
+ --disable-static \
|
|
|
|
+ --enable-arrow-scrollbars \
|
|
|
|
+ --enable-gray-stipples \
|
|
|
|
+ --enable-multiplane-bitmaps
|
|
|
|
+make %{?_smp_mflags}
|
|
|
|
|
|
-# Xaw3d7
|
|
|
|
-pushd xc/lib/Xaw3d
|
|
|
|
-#export PATH=/usr/X11R6/bin:$PATH
|
|
|
|
-xmkmf
|
|
|
|
-make CDEBUGFLAGS="${RPM_OPT_FLAGS} -DARROW_SCROLLBAR -DUSEGRAY"
|
|
|
|
-popd
|
|
|
|
-
|
|
|
|
-# Xaw3d6 (compat libs)
|
|
|
|
-%if %{compatlib}
|
|
|
|
-%ifnarch ia64
|
|
|
|
-cp %{SOURCE2} xc/lib/Xaw3d6
|
|
|
|
-pushd xc/lib/Xaw3d6
|
|
|
|
-xmkmf
|
|
|
|
-make CFLAGS="${RPM_OPT_FLAGS} -DARROW_SCROLLBAR -DUSEGRAY"
|
|
|
|
-popd
|
|
|
|
-%endif
|
|
|
|
-%endif
|
|
|
|
|
|
|
|
%install
|
|
%install
|
|
rm -rf $RPM_BUILD_ROOT
|
|
rm -rf $RPM_BUILD_ROOT
|
|
-
|
|
|
|
-# Xaw3d7
|
|
|
|
-pushd xc/lib/Xaw3d
|
|
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
-popd
|
|
|
|
-
|
|
|
|
-# Xaw3d6
|
|
|
|
-%if %{compatlib}
|
|
|
|
-%ifnarch ia64
|
|
|
|
-%__mkdir_p $RPM_BUILD_ROOT/usr/%{_lib}
|
|
|
|
-cp -aR xc/lib/Xaw3d6/libXaw*so.* $RPM_BUILD_ROOT/usr/%{_lib}/
|
|
|
|
-%endif
|
|
|
|
-%endif
|
|
|
|
|
|
+rm $RPM_BUILD_ROOT%{_libdir}/libXaw3d.la
|
|
|
|
+rm -r $RPM_BUILD_ROOT%{_docdir}
|
|
|
|
|
|
%clean
|
|
%clean
|
|
rm -rf $RPM_BUILD_ROOT
|
|
rm -rf $RPM_BUILD_ROOT
|
|
@@ -202,22 +138,27 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%files
|
|
%files
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-/usr/%{_lib}/*.so.*
|
|
|
|
|
|
+%{_libdir}/*.so.*
|
|
|
|
+
|
|
|
|
+%files devel
|
|
|
|
+%defattr(-,root,root)
|
|
|
|
+%{_includedir}/X11/Xaw3d
|
|
|
|
+%{_libdir}/*.so
|
|
|
|
+%{_libdir}/pkgconfig/xaw3d.pc
|
|
|
|
|
|
%if %{build_compat32}
|
|
%if %{build_compat32}
|
|
%files -n compat32-%{name}
|
|
%files -n compat32-%{name}
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-/usr/%{_lib}/*.so.*
|
|
|
|
|
|
+%{_libdir}/*.so.*
|
|
%endif
|
|
%endif
|
|
|
|
|
|
-%files devel
|
|
|
|
-%defattr(-,root,root)
|
|
|
|
-#/usr/X11R6/%{_lib}/*.a
|
|
|
|
-/usr/%{_lib}/*.so
|
|
|
|
-%{_includedir}/X11/Xaw3d
|
|
|
|
-#ghost /usr/X11R6/include/Xaw3d
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.2-1
|
|
|
|
+- update to 1.6.2
|
|
|
|
+- merge with Xaw3d-1.6.2-9.fc24
|
|
|
|
+- remove BuildRequires: imake
|
|
|
|
+
|
|
* Sun Jul 12 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.5E-6
|
|
* Sun Jul 12 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.5E-6
|
|
- update Requires of -devel
|
|
- update Requires of -devel
|
|
|
|
|