Browse Source

Xaw3d: new upstream release
others: rebuild with gcc-5.4.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10580 ec354946-7b23-47d6-9f5a-488ba84defc7

Takemikaduchi 7 years ago
parent
commit
c485e3a4b5

+ 34 - 93
X/Xaw3d/Xaw3d-vl.spec

@@ -3,32 +3,18 @@
 Summary:	A version of the MIT Athena widget set for X.
 Summary(ja):	X 用 MIT Athena widget の 3D 風バージョン
 Name:		Xaw3d
-Version:	1.5E
-Release:	6%{?_dist_release}
+Version:	1.6.2
+Release:	1%{?_dist_release}
 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
-Prereq:		fileutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires: libXmu-devel
 BuildRequires: libXt-devel
@@ -36,7 +22,6 @@ BuildRequires: libSM-devel
 BuildRequires: libXext-devel
 BuildRequires: libX11-devel
 BuildRequires: libXpm-devel
-BuildRequires: imake
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: ed
@@ -120,74 +105,25 @@ Xaw3d-devel パッケージをインストールして下さい.
 同時に Xaw3d もインストールしておく必要があります.
 
 %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
+%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
 rm -rf $RPM_BUILD_ROOT
-
-# Xaw3d7
-pushd xc/lib/Xaw3d
 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
 rm -rf $RPM_BUILD_ROOT
@@ -202,22 +138,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %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}
 %files -n compat32-%{name}
 %defattr(-,root,root)
-/usr/%{_lib}/*.so.*
+%{_libdir}/*.so.*
 %endif
 
-%files devel
-%defattr(-,root,root)
-#/usr/X11R6/%{_lib}/*.a
-/usr/%{_lib}/*.so
-%{_includedir}/X11/Xaw3d
-#ghost /usr/X11R6/include/Xaw3d
 
 %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
 - update Requires of -devel
 

+ 4 - 1
f/freeimage/freeimage-vl.spec

@@ -5,7 +5,7 @@ Summary:        Multi-format image decoder library
 Summary(ja):    マルチフォーマット画像デコードライブラリ
 Name:           freeimage
 Version:        3.10.0
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 
 Group:          System Environment/Libraries
 # freeimage is dual-licensed, see Whatsnew.txt (search for license) or:
@@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.10.0-3
+- rebuild with gcc-5.4.0
+
 * Thu Apr 14 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.10.0-2
 - rebuilt with libmng 2.0.2, libpng 1.6.12, libtiff 4.0.3, OpenEXR 2.2.0 and openjpeg 1.5.2
 - added Patch2 and Patch3

+ 4 - 1
g/gperf/gperf-vl.spec

@@ -2,7 +2,7 @@ Summary:	A perfect hash function generator.
 Summary(ja):	完全ハッシュ関数生成プログラム
 Name:		gperf
 Version:	3.0.4
-Release:	3%{?_dist_release}
+Release:	4%{?_dist_release}
 License:	GPLv3+
 Source:		ftp://ftp.gnu.org/pub/gnu/gperf/gperf-%{version}.tar.gz
 Group:		Development/Tools
@@ -53,6 +53,9 @@ fi
 %{_infodir}/gperf.info*
 
 %changelog
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.0.4-4
+- rebuild with gcc-5.4.0
+
 * Wed Oct 29 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.0.4-3
 - rebuild with VineSeed environment
 

+ 4 - 1
g/gperftools/gperftools-vl.spec

@@ -1,6 +1,6 @@
 Name:		gperftools
 Version:	2.0
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 License:	BSD
 Group:		Development/Tools
 Summary:	Very fast malloc and performance analysis tools
@@ -107,6 +107,9 @@ rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/INSTALL
 %{_libdir}/*.so.*
 
 %changelog
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0-3
+- rebuild with gcc-5.4.0
+
 * Wed Oct 24 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 	2.0-2
 - rebuild with libunwind-1.0.1
 

+ 3 - 0
g/gv/gv-vl.spec

@@ -100,6 +100,9 @@ desktop-file-install --vendor=vine \
 %{_mandir}/man1/gv-update-userconfig.*
 
 %changelog
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.7.4-3
+- rebuild with Xaw3d-1.6.2
+
 * Sat Jul 25 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.7.4-2
 - update to 3.7.4
 

+ 4 - 1
lib/liba/libalkimia/libalkimia-vl.spec

@@ -1,7 +1,7 @@
 Name:    libalkimia
 Summary: Financial library
 Version: 4.3.2
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 License: LGPLv2+
 URL:     http://kde-apps.org/content/show.php/libalkimia?content=137323
@@ -81,6 +81,9 @@ test "$(pkg-config --modversion libalkimia)" = "%{version}"
 
 
 %changelog
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.3.2-3
+- rebuild with gcc-5.4.0
+
 * Mon Oct 27 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.3.2-2
 - added BR: cmake
 - added Group tag

+ 4 - 1
lib/libc/libcrystalhd/libcrystalhd-vl.spec

@@ -3,7 +3,7 @@
 
 Name:           libcrystalhd
 Version:        3.10.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Broadcom Crystal HD device interface library
 Summary(ja):    Broadcom Crystal HD デバイスのインターフェースライブラリ
 
@@ -146,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.10.0-2
+- rebuild with gcc-5.4.0
+
 * Tue Mar 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.10.0-1
 - updated to 3.10.0 based on Fedora 3.10.0-8
 - changed gstreamer-plugin-crystalhd to System Environment/Libraries Group

+ 4 - 1
lib/libd/libdap/libdap-vl.spec

@@ -1,6 +1,6 @@
 Name:             libdap
 Version:          3.11.2
-Release:          1%{?_dist_release}
+Release:          2%{?_dist_release}
 Summary:          The C++ DAP2 library from OPeNDAP
 Summary(ja):      OPeNDAP の C++ DAP2 ライブラリ
 License:          LGPL
@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.11.2-2
+- rebuild with gcc-5.4.0
+
 * Tue Jun 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.11.2-1
 - update to 3.11.2
 - add BuildRequires: bision, flex, cppunit-devel, libuuid-devel

+ 4 - 1
lib/libe/libebml/libebml-vl.spec

@@ -1,7 +1,7 @@
 Summary: 	Extensible Binary Meta Language library
 Name: 		libebml
 Version: 	1.3.0
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 License: 	LGPLv2
 Group: 		System Environment/Libraries
 URL: 		http://www.matroska.org/
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.3.0-2
+- rebuild with gcc-5.4.0
+
 * Sun Aug 24 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.3.0-1
 - update to 1.3.0
 

+ 4 - 1
lib/libe/libemf/libemf-vl.spec

@@ -2,7 +2,7 @@ Summary:       library for generating Enhanced Metafiles
 Summary(ja):   EMF作成ライブラリ
 Name:          libemf
 Version:       1.0.7
-Release:       1%{?_dist_release}
+Release:       2%{?_dist_release}
 Group:         System Environment/Libraries
 License:       LGPL
 Source:        libEMF-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/libEMF.la
 
 %changelog
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.7-2
+- rebuild with gcc-5.4.0
+
 * Sun Aug 24 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.7-1
 - update to 1.0.7
 - remove old patches

+ 4 - 1
lib/libi/libindi/libindi-vl.spec

@@ -3,7 +3,7 @@
 Name: libindi
 Summary: Instrument Neutral Distributed Interface
 Version: 0.8
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 Group: System Environment/Libraries
 License: LGPLv2+ and GPLv2+
@@ -88,6 +88,9 @@ rm -fr %{buildroot}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.8.0-3
+- rebuild with gcc-5.4.0
+
 * Wed Feb 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.8.0-2
 - rebuilt with cfitsio 3.370 and libnova 0.15.0
 

+ 4 - 1
t/texlive/texlive-vl.spec

@@ -11,7 +11,7 @@ Summary: The TeX text formatting system
 Summary(ja): TeX 文書整形システム
 Name: texlive
 Version: 2016
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: distributable
 Group: Applications/Publishing
 URL: http://www.tug.org/texlive/
@@ -558,6 +558,9 @@ exit 0
 
 
 %changelog
+* Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2016-4
+- rebuild with gcc-5.4.0
+
 * Mon Jun  6 2016 Munehiro Yamamoto <munepi@vinelinux.org> 2016-3
 - texlive-20160523-source (TeX Live 2016)