rpms/javacc/devel javacc.spec,1.29,1.30
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Jun 4 18:25:28 UTC 2010
Author: akurtakov
Update of /cvs/pkgs/rpms/javacc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12431/devel
Modified Files:
javacc.spec
Log Message:
- Apply changes requested in review bug (rhbz#225940).
Index: javacc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javacc/devel/javacc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- javacc.spec 11 Feb 2010 10:39:08 -0000 1.29
+++ javacc.spec 4 Jun 2010 18:25:28 -0000 1.30
@@ -28,15 +28,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define section free
-
Name: javacc
Version: 5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: A parser/scanner generator for java
License: BSD
-Source0: https://javacc.dev.java.net/files/documents/17/142527/%{name}-5.0src.tar.gz
+Source0: https://javacc.dev.java.net/files/documents/17/142527/%{name}-%{version}src.tar.gz
Source1: javacc.sh
Source2: jjdoc
Source3: jjtree
@@ -82,10 +80,6 @@ Examples for %{name}.
find . -name "*.jar" -exec rm {} \;
find . -name "*.class" -exec rm {} \;
-cp -p %{SOURCE1} bin/javacc
-cp -p %{SOURCE2} bin/jjdoc
-cp -p %{SOURCE3} bin/jjtree
-
cp -p %{SOURCE4} bootstrap/javacc.jar
%build
@@ -103,12 +97,12 @@ install -d -m 755 $RPM_BUILD_ROOT%{_java
install -m 644 bin/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install -d -m 755 $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 bin/javacc bin/jjdoc bin/jjrun bin/jjtree $RPM_BUILD_ROOT/%{_bindir}
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
-cp -pr examples $RPM_BUILD_ROOT/%{_datadir}/%{name}
+install -pD -T -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/javacc.sh
+install -pD -T -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/jjdoc
+install -pD -T -m 755 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir}/jjtree
-mkdir -p $RPM_BUILD_ROOT/%{_mavenpomdir}
-cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap net.java.dev.javacc %{name} %{version} JPP %{name}
@@ -135,9 +129,12 @@ rm -rf $RPM_BUILD_ROOT
%files demo
%defattr(-,root,root,-)
-%{_datadir}/%{name}
+%doc examples
%changelog
+* Fri Jun 4 2010 Alexander Kurtakov <akurtako at redhat.com> 0:5.0-2
+- Apply changes requested in review bug (rhbz#225940).
+
* Thu Feb 11 2010 Alexander Kurtakov <akurtako at redhat.com> 0:5.0-1
- Update to upstream 5.0 release.
More information about the scm-commits
mailing list