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