Browse Source

rebuild with rpm-4.8.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3585 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 13 years ago
parent
commit
a460d7d3ec

+ 4 - 1
b/blueman/blueman-vl.spec

@@ -3,7 +3,7 @@ Summary(ja): 	GNOME/GTK 用の高機能な Bluetooth マネージャ
 
 Name: 		blueman
 Version: 	1.21
-Release: 	3%{?_dist_release}
+Release: 	4%{?_dist_release}
 License: 	GPLv2+
 Group: 		Applications/System
 Url: 		http://blueman-project.org/
@@ -137,6 +137,9 @@ fi
 
 
 %changelog
+* Mon Apr 18 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.21-4
+- rebuild with rpm-4.8.1
+
 * Sun Feb 07 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.21-3
 - add BuildRequires: gtk2-devel
 

+ 4 - 1
g/gnome-audio/gnome-audio-vl.spec

@@ -2,7 +2,7 @@ Summary:	Sounds for GNOME events.
 Summary(ja):	GNOMEイベント用効果音
 Name:		gnome-audio
 Version:	2.22.2
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 License:	LGPL
 Group:		Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.22/%{name}-%{version}.tar.bz2
@@ -74,6 +74,9 @@ mkdir -p $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 19 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.22.2-3
+- rebuild with rpm-4.8.1
+
 * Mon Apr 13 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 	2.22.2-2
 - spec in utf-8
 

+ 4 - 1
k/kudzu/kudzu-vl.spec

@@ -1,6 +1,6 @@
 Name: kudzu
 Version: 1.2.85
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 License: GPL
 Summary: The Vine Linux hardware probing tool.
 Summary(ja): Vine Linux ハードウエア検出ツール
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kudzu
 
 %changelog
+* Tue Apr 19 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.85-5
+- rebuild with rpm-4.8.1
+
 * Sun Feb 07 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.85-4
 - add BuildRequires: pciutils-static, zlib-devel
 

+ 6 - 1
n/notification-daemon/notification-daemon-vl.spec

@@ -6,7 +6,7 @@
 Summary: Notification Daemon 
 Name: notification-daemon
 Version: 0.4.0
-Release: 8%{?_dist_release}
+Release: 9%{?_dist_release}
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -50,6 +50,8 @@ BuildRequires: libsexy-devel
 BuildRequires: libwnck-devel
 BuildRequires: GConf2-devel
 BuildRequires: libglade2-devel
+BuildRequires: gstreamer-devel
+BuildRequires: desktop-file-utils
 
 %description
 notification-daemon is the server implementation of the freedesktop.org
@@ -156,6 +158,9 @@ rm -rf %{buildroot}
 %{_datadir}/notification-daemon/notification-properties.glade
 
 %changelog
+* Wed Apr 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.0-9
+- add BuildRequires: gstreamer-devel, desktop-file-utils
+
 * Tue Apr 19 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.4.0-8
 - add missing BuildRequires: GConf2-devel, libglade2-devel
 

+ 42 - 30
o/openMotif/openMotif-vl.spec

@@ -1,6 +1,6 @@
 Summary: The Open Motif runtime components.
 Name: openMotif
-Version: 2.3.0
+Version: 2.3.3
 Release: 1%{?_dist_release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: The Open Group Public License
@@ -9,23 +9,32 @@ Source0: ftp://ftp.ics.com/openmotif/2.3/%{version}/openmotif-%{version}.tar.gz
 Source1: xmbind
 # license at http://www.opengroup.org/openmotif/license/
 Source2: OPEN_GROUP_PUBLIC_LICENSE.html
-## not build and install demos (modified for cvs20061112)
-Patch0: openmotif-2.3.0-20061112-no_demos.patch
-## Patch1 is for CVE-2005-3964
+
+Patch0: openmotif-2.3.3-no_demos.patch
 Patch1: openMotif-2.2.3-uil_lib.patch
-## Patch2 is for xorg7
 Patch2: openMotif-2.3.0-rgbtxt.patch
-## change mwvrc dir (modified for cvs20061112)
-Patch3: openmotif-2.3.0-20061112-mwmrc_dir.patch
-## #Patch4 is for xorg7 (modified for cvs20061112)
-Patch4: openmotif-2.3.0-20061112-bindings.patch
+Patch3: openmotif-2.3.3-mwmrc_dir.patch
+Patch4: openmotif-2.3.3-bindings.patch
 Patch5: openMotif-2.3.0-no_X11R6.patch
-Patch6: openmotif-sentinel.diff
-Patch7: openmotif-unaligned.diff
+Patch6: openmotif-2.3.3-missing_deps.patch
+
 
 URL: http://www.motifzone.org/
-BuildPrereq: xorg-x11-devel xorg-x11-xbitmaps
-BuildPrereq: flex byacc automake14
+
+Buildrequires: automake
+BuildRequires: autoconf
+BuildRequires: texinfo
+BuildRequires: flex
+BuildRequires: byacc
+BuildRequires: perl
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libXft-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXp-devel
+BuildRequires: libXt-devel
+BuildRequires: libXext-devel
+BuildRequires: xorg-x11-xbitmaps
 Obsoletes: %{name}-devel < 2.2.2-0vl5
 Obsoletes: %{name}-demos
 Conflicts: lesstif-clients lesstif-mwm
@@ -50,7 +59,7 @@ Uil and xmbind.
 %package devel
 Summary: The Open Motif development libraries and tools.
 Group: Development/Libraries
-PreReq: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Conflicts: lesstif lesstif-devel lesstif-static
 
 %description devel
@@ -64,30 +73,29 @@ environments.
 %prep
 %setup -q -n openmotif-%{version}
 cp -f %{SOURCE2} .
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p0
-%patch7 -p0
+%patch0 -p1 -b .no_demos
+%patch1 -p1 -b .uil_lib
+%patch2 -p1 -b .rgbtxt
+%patch3 -p1 -b .mwmrc_dir
+%patch4 -p1 -b .bindings
+%patch5 -p1 -b .no_X11R6
+%patch6 -p1 -b .missing_deps
 
 %build
-unset LANG || :
-libtoolize --force --automake
-aclocal-1.4 -I .
+aclocal -I .
+automake --foreign
 autoconf
-autoheader
-automake-1.4 --foreign --include-deps --add-missing
 
-%configure  --enable-static
+%configure \
+   --enable-static \
+   --enable-xft \
+   --enable-jpeg \
+   --enable-png
 
-perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
 export LD_LIBRARY_PATH=`pwd`/lib/Mrm/.libs:`pwd`/lib/Xm/.libs
 make clean
 
-LANG=C make
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -141,6 +149,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/*
 
 %changelog
+* Sun Apr 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.3.3-1
+- update top 2.3.3
+- update patches for openMotif-2.3.3
+
 * Tue May 27 2008 AKIYAMA Kazuhito <akiyama@yb3.so-net.ne.jp> 2.3.0-1
 - new upstream release
 - revised patches (from momonga)

+ 13 - 11
x/xorg-x11-filesystem/xorg-x11-filesystem-vl.spec

@@ -1,14 +1,12 @@
 Summary: X.Org X11 filesystem layout
 Summary(ja): X.Org X11 ファイルシステムレイアウト
 Name: xorg-x11-filesystem
-Version: 7.4
+Version: 7.6
 Release: 1%{?_dist_release}
 License: MIT/X11
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildArch: noarch
-
 Requires(pre): filesystem >= 2.4
 Obsoletes: XOrg-devel < 7.0
 
@@ -26,8 +24,8 @@ rm -rf $RPM_BUILD_ROOT
 
 # NOTE: Do not replace these with _libdir or _includedir macros, they are
 #       intentionally explicit.
-mkdir -p "$RPM_BUILD_ROOT/usr/lib/X11"
-mkdir -p "$RPM_BUILD_ROOT/usr/include/X11"
+mkdir -p "$RPM_BUILD_ROOT%{_libdir}/X11"
+mkdir -p "$RPM_BUILD_ROOT%{_includedir}/X11"
 mkdir -p "$RPM_BUILD_ROOT%{_datadir}/X11"
 mkdir -p "$RPM_BUILD_ROOT%{_bindir}"
 
@@ -46,10 +44,10 @@ cat > "$RPM_BUILD_ROOT/${UPGRADE_CMD}" <<'EOF'
 #
 # NOTE: Do not replace these with _libdir or _includedir macros, they are
 #       intentionally explicit.
-for dir in /usr/include/X11 /usr/lib/X11 ; do
+for dir in %{_includedir}/X11 %{_libdir}/X11 ; do
     [ -L "$dir" ] && rm -f -- "$dir" &> /dev/null
 done
-for dir in /usr/include/X11 /usr/lib/X11 ; do
+for dir in %{_includedir}/X11 %{_libdir}/X11 ; do
     [ ! -d "$dir" ] && mkdir -p "$dir" &> /dev/null
 done
 exit 0
@@ -65,10 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 # NOTE: Do not replace these with _libdir or _includedir macros, they are
 #       intentionally explicit.
 # Remove old symlinks if present, and replace them with directories.
-for dir in /usr/include/X11 /usr/lib/X11 ; do
+for dir in %{_includedir}/X11 %{_libdir}/X11 ; do
     [ -L "$dir" ] && rm -f -- "$dir" &> /dev/null
 done
-for dir in /usr/include/X11 /usr/lib/X11 ; do
+for dir in %{_includedir}/X11 %{_libdir}/X11 ; do
     [ ! -d "$dir" ] && mkdir -p "$dir" &> /dev/null
 done
 exit 0
@@ -78,13 +76,17 @@ exit 0
 # NOTE: These are explicitly listed intentionally, instead of using rpm
 #       macros, as these exact locations are required for compatibility
 #       regardless of what _libdir or _includedir point to.
-%dir /usr/lib/X11
-%dir /usr/include/X11
+%dir %{_libdir}/X11
+%dir %{_includedir}/X11
 %dir %{_datadir}/X11
 %dir %{_bindir}/xorg-x11-filesystem-upgrade
 %{_bindir}/xorg-x11-filesystem-upgrade
 
 %changelog
+* Sun Apr 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 7.6-1
+- remove BuildArch: noarch
+- bump version to 7.6-1
+
 * Tue Apr 07 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 7.4-1
 - spec in utf-8
 - bump version to 7.4-1

+ 2 - 2
x/xorg-x11-resutils/xorg-x11-resutils-vl.spec

@@ -3,7 +3,7 @@
 Summary: X.Org X11 X resource utilities
 Summary(ja): X.Org X11 X resource ユーティリティ
 Name: xorg-x11-%{pkgname}
-Version: 7.5
+Version: 7.6
 Release: 1%{?_dist_release}
 License: MIT/X11
 Group: User Interface/X
@@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/viewres.1*
 
 %changelog
-* Sun Nov 07 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 7.5-2
+* Sun Apr 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 7.6-1
 - appres-1.0.2
 - editres-1.0.4
 - listres-1.0.2