rpms/erlang/devel erlang.spec,1.60,1.61
Hans Ulrich Niedermann
ndim at fedoraproject.org
Tue Jul 27 10:59:19 UTC 2010
Author: ndim
Update of /cvs/pkgs/rpms/erlang/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22294
Modified Files:
erlang.spec
Log Message:
* Mon Jul 26 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - R14A-0.4
- Spec file cleanups:
- Avoid accidental %rel increments by rpmdev-bumpspec.
- Use %global for our spec file macros.
- Use macro for redundant directory names.
- Whitespace cleanups (tabs vs. spaces).
- Fix accidental macro usage in %changelog.
Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- erlang.spec 14 Jul 2010 12:50:41 -0000 1.60
+++ erlang.spec 27 Jul 2010 10:59:18 -0000 1.61
@@ -1,17 +1,18 @@
-%define ver R14A
-# Please, dont increment %%{rel} during rebuilds - it's a mainstream's
-# version which should be increased only during major upgrades
-%define rel 0
+%global upstream_ver R14A
+# Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it!
+%global upstream_rel 0
+
+%global n_uvr %{name}-%{upstream_ver}-%{upstream_rel}
Name: erlang
-Version: %{ver}
-Release: %{rel}.3%{?dist}
+Version: %{upstream_ver}
+Release: %{upstream_rel}.4%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
License: ERPL
URL: http://www.erlang.org
-Source0: http://www.erlang.org/download/otp_src_%{ver}.tar.gz
+Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}.tar.gz
Source3: erlang-find-provides.escript
Source4: erlang-find-provides.sh
Source5: erlang-find-requires.escript
@@ -415,7 +416,7 @@ Requires: %{name}-kernel = %{version}-%{
Requires: %{name}-stdlib = %{version}-%{release}
BuildRequires: tcl-devel
BuildRequires: tk-devel
-Requires: tk
+Requires: tk
Obsoletes: %{name} < R13B-04.5
%description gs
@@ -542,7 +543,7 @@ Requires: %{name}-erts = %{version}-%{re
Requires: %{name}-kernel = %{version}-%{release}
Requires: %{name}-stdlib = %{version}-%{release}
Obsoletes: %{name} < R13B-04.5
-BuildRequires: unixODBC-devel
+BuildRequires: unixODBC-devel
%description odbc
An interface to relational SQL-databases built on ODBC (Open Database
@@ -847,7 +848,7 @@ Requires: %{name}-stdlib = %{version}-%{
Requires: mesa-libGL
Requires: mesa-libGLU
Obsoletes: %{name} < R13B-04.5
-BuildRequires: wxGTK-devel
+BuildRequires: wxGTK-devel
%description wx
A Graphics System used to write platform independent user interfaces.
@@ -864,7 +865,7 @@ Obsoletes: %{name} < R13B-04.5
Provides support for XML 1.0.
%prep
-%setup -q -n otp_src_%{ver}
+%setup -q -n otp_src_%{upstream_ver}
%patch1 -p1 -b .do_not_format_manpages
%patch2 -p1 -b .rpath
%patch4 -p1 -b .dlopen_opengl_libs
@@ -910,18 +911,18 @@ find $RPM_BUILD_ROOT%{_libdir}/erlang/li
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/erlang/bin
# Relocate doc-files into the proper directory
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}/lib
pushd .
cd $RPM_BUILD_ROOT%{_libdir}/erlang
-mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}
-for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/$i ; done
+mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}
+for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}/$i ; done
cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib
-for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}/lib/$i || true ; done
+for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}/lib/$i || true ; done
popd
-cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}
-mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}
-mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}
-mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}-%{rel}
+cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}
+mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}
+mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}
+mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}
# Win32-specific man-pages
rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/erlsrv.*
@@ -947,13 +948,13 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%dir %{_docdir}/%{name}-%{ver}-%{rel}/
-%doc %{_docdir}/%{name}-%{ver}-%{rel}/AUTHORS
-%doc %{_docdir}/%{name}-%{ver}-%{rel}/COPYRIGHT
-%doc %{_docdir}/%{name}-%{ver}-%{rel}/EPLICENCE
-%doc %{_docdir}/%{name}-%{ver}-%{rel}/PR.template
-%doc %{_docdir}/%{name}-%{ver}-%{rel}/README
-%doc %{_docdir}/%{name}-%{ver}-%{rel}/README.md
+%dir %{_docdir}/%{n_uvr}/
+%doc %{_docdir}/%{n_uvr}/AUTHORS
+%doc %{_docdir}/%{n_uvr}/COPYRIGHT
+%doc %{_docdir}/%{n_uvr}/EPLICENCE
+%doc %{_docdir}/%{n_uvr}/PR.template
+%doc %{_docdir}/%{n_uvr}/README
+%doc %{_docdir}/%{n_uvr}/README.md
%files appmon
%defattr(-,root,root)
@@ -1109,9 +1110,9 @@ rm -rf $RPM_BUILD_ROOT
%files doc
%defattr(-,root,root)
-%doc %{_docdir}/%{name}-%{ver}-%{rel}/doc
-%doc %{_docdir}/%{name}-%{ver}-%{rel}/erts-*/
-%doc %{_docdir}/%{name}-%{ver}-%{rel}/lib/
+%doc %{_docdir}/%{n_uvr}/doc
+%doc %{_docdir}/%{n_uvr}/erts-*/
+%doc %{_docdir}/%{n_uvr}/lib/
%files docbuilder
@@ -1948,6 +1949,14 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jul 26 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - R14A-0.4
+- Spec file cleanups:
+ - Avoid accidental %%rel increments by rpmdev-bumpspec.
+ - Use %%global for our spec file macros.
+ - Use macro for redundant directory names.
+ - Whitespace cleanups (tabs vs. spaces).
+ - Fix accidental macro usage in %%changelog.
+
* Wed Jul 14 2010 Dan Horák <dan at danny.cz> - R14A-0.3
- rebuilt against wxGTK-2.8.11-2
@@ -2036,7 +2045,7 @@ rm -rf $RPM_BUILD_ROOT
* Sun Mar 1 2009 Gerard Milmeister <gemi at bluewin.ch> - R12B-5.6
- new release R12B-5
-- link escript and dialyzer to %{_bindir}
+- link escript and dialyzer to %%{_bindir}
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - R12B-5.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the scm-commits
mailing list