Merge branch 'master' into f12

Conflicts: .gitignore sources vifir.spec
dist-git conversion
2011-03-14 08:47:56 -04:00 · 2010-07-29 14:58:47 +00:00 · 2010-07-20 12:54:19 +00:00 · 2010-07-05 16:47:00 +00:00 · 2010-05-20 13:56:27 +00:00 · 2009-11-26 01:13:55 +00:00
1 changed files with 0 additions and 5 deletions
--- a/vifir.spec
+++ b/vifir.spec
@ -43,13 +43,11 @@ Bag.
 %prep
 %setup -q

-
 %build
 export CXXFLAGS="$RPM_OPT_FLAGS"
 %configure --prefix=%{_prefix} --libdir=%{_libdir}
 make %{?_smp_mflags}

-
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
@ -58,11 +56,9 @@ desktop-file-install                                    \
    --dir=%{buildroot}%{_datadir}/applications          \
    %{buildroot}%{_datadir}/applications/%{name}.desktop

-
 %clean
 rm -rf %{buildroot}

-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING DEVELOPERS README THANKS TODO
@ -72,7 +68,6 @@ rm -rf %{buildroot}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/*.png

-
 %changelog
 * Mon Mar 14 2011 Dave Ludlow <dave@adsllc.com> - 0.8-1
 - Clip airport elevations to 32,767 feet when importing X-Plane data
Author	SHA1	Message	Date
David Ludlow	c4c914608f	Merge branch 'master' into f12 Conflicts: .gitignore sources vifir.spec	2011-03-14 08:47:56 -04:00
Fedora Release Engineering	9d37518107	dist-git conversion	2010-07-29 14:58:47 +00:00
Dave Ludlow	e3b5b5b69b	Update for upstream vifir-0.7-1 release	2010-07-20 12:54:19 +00:00
Dave Ludlow	5725ca3e6f	Update for vifir-0.6-1	2010-07-05 16:47:00 +00:00
Dave Ludlow	f25938d9c8	Update for vifir-0.5	2010-05-20 13:56:27 +00:00
Bill Nottingham	ac6559f534	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:13:55 +00:00
Jesse Keating	74b84c44b1	Initialize branch F-12 for vifir	2009-09-29 07:15:55 +00:00