rpms/splat/F-10 splat.spec,1.2,1.3
Sindre Pedersen Bjørdal
sindrepb at fedoraproject.org
Sun Dec 21 22:19:34 UTC 2008
- Previous message (by thread): rpms/feh/devel feh-1.3.4-dejavu.patch,NONE,1.1 feh.spec,1.13,1.14
- Next message (by thread): rpms/puppet/EL-5 .cvsignore, 1.23, 1.24 puppet.spec, 1.26, 1.27 sources, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sindrepb
Update of /cvs/pkgs/rpms/splat/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10037
Modified Files:
splat.spec
Log Message:
merge main and sub
Index: splat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/splat/F-10/splat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- splat.spec 30 Jul 2008 23:34:36 -0000 1.2
+++ splat.spec 21 Dec 2008 22:19:04 -0000 1.3
@@ -1,6 +1,10 @@
Name: splat
Version: 1.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
+
+Provides: splat-utils = %{version}-%{release}
+Obsoletes: splat-utils < 1.2.3-1
+
Summary: Analyze point-to-point terrestrial RF communication links
Group: Applications/Communications
@@ -26,22 +30,6 @@
communication links, and provides information useful to communication system
designers and site engineers.
-%package utils
-Summary: Utilities for use with SPLAT!
-Group: Applications/Communications
-Requires: %{name} = %{version}-%{release}
-
-%description utils
-Utilities for use with SPLAT!
-
-Includes:
-citydecoder
-bearing
-postdownload
-srtm2sdf
-usg2sdf
-
-
%prep
%setup -q
%patch0 -p1 -b .ppc
@@ -79,32 +67,25 @@
install -D -m 0644 utils/srtm2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/srtm2sdf.1
install -D -m 0644 utils/usgs2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/usgs2sdf.1
+#rename this to avoid conflict with main readme
+mv utils/README utils/README-utils
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc CHANGES COPYING README
+%doc CHANGES COPYING README utils/README-utils utils/fips.txt
%doc sample_data
-%{_bindir}/splat
-%{_mandir}/man?/splat*
+%{_bindir}/*
%{_mandir}/es/man?/splat*
-
-%files utils
-%doc COPYING utils/README utils/fips.txt
-%{_bindir}/citydecoder
-%{_bindir}/bearing
-%{_bindir}/postdownload
-%{_bindir}/srtm2sdf
-%{_bindir}/usgs2sdf
-%{_mandir}/man?/citydecoder*
-%{_mandir}/man?/bearing*
-%{_mandir}/man?/postdownload*
-%{_mandir}/man?/srtm2sdf*
-%{_mandir}/man?/usgs2sdf*
+%{_mandir}/man?/*
%changelog
+* Sun Dec 22 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 1.2.3-2
+- Merge main and -utils package, #475009
+
* Wed Jul 30 2008 Steve Conklin <fedora at conklinhouse.com> - 1.2.3-1
- New upstream
- added delivery of postdownload script and the new bearing utility
- Previous message (by thread): rpms/feh/devel feh-1.3.4-dejavu.patch,NONE,1.1 feh.spec,1.13,1.14
- Next message (by thread): rpms/puppet/EL-5 .cvsignore, 1.23, 1.24 puppet.spec, 1.26, 1.27 sources, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list