[mingw-antlr] Moved antlr-config script to proper location and cleanups
epienbro
epienbro at fedoraproject.org
Tue Jan 31 14:04:51 UTC 2012
commit fdffab9e67ce3cc8888fc37d9148b38063913831
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Tue Jan 31 15:04:08 2012 +0100
Moved antlr-config script to proper location and cleanups
- Moved the antlr-config script from %{_exec_prefix}/%{_mingw32_target}/bin to %{_mingw32_bindir}
- Dropped the dependency extraction magic as it's done automatically by RPM 4.9
- Dropped the %%clean section and %%defattr tags
mingw-antlr.spec | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/mingw-antlr.spec b/mingw-antlr.spec
index 483c219..fafc628 100644
--- a/mingw-antlr.spec
+++ b/mingw-antlr.spec
@@ -1,8 +1,5 @@
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}
%global mingw_pkg_name antlr
@@ -10,7 +7,7 @@
Summary: MinGW Windows ANTLR C++ run-time library
Name: mingw-%{mingw_pkg_name}
Version: 2.7.7
-Release: 6%{?dist}
+Release: 7%{?dist}
License: Public Domain
URL: http://www.antlr.org/
Group: Development/Libraries
@@ -83,29 +80,30 @@ popd
rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libantlr2.la
-mkdir -p $RPM_BUILD_ROOT{%{_exec_prefix}/%{_mingw32_target}/bin,%{_bindir}}
-install -p -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_exec_prefix}/%{_mingw32_target}/bin/antlr-config
-ln -s %{_exec_prefix}/%{_mingw32_target}/bin/antlr-config $RPM_BUILD_ROOT%{_bindir}/%{_mingw32_target}-antlr-config
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir $RPM_BUILD_ROOT%{_bindir}
+install -p -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_mingw32_bindir}/antlr-config
+ln -s %{_mingw32_bindir}/antlr-config $RPM_BUILD_ROOT%{_bindir}/%{_mingw32_target}-antlr-config
%files -n mingw32-%{mingw_pkg_name}
-%defattr(-,root,root,-)
%doc LICENSE.txt
%{_mingw32_includedir}/%{mingw_pkg_name}
+%{_mingw32_bindir}/antlr-config
%{_mingw32_bindir}/libantlr2-0.dll
%{_mingw32_libdir}/libantlr2.dll.a
%{_mingw32_libdir}/pkgconfig/antlr2.pc
-%{_exec_prefix}/%{_mingw32_target}/bin/antlr-config
%{_bindir}/%{_mingw32_target}-antlr-config
%files -n mingw32-%{mingw_pkg_name}-static
-%defattr(-,root,root,-)
%{_mingw32_libdir}/libantlr2.a
%changelog
+* Tue Jan 31 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.7.7-7
+- Moved the antlr-config script from %%{_exec_prefix}/%%{_mingw32_target}/bin
+ to %%{_mingw32_bindir}
+- Dropped the dependency extraction magic as it's done automatically by RPM 4.9
+- Dropped the %%clean section and %%defattr tags
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list