[cmake-fedora/f12/master: 2/2] Merge branch 'master' into f12

[Ding-Yi Chen]

commit 2fa0916ed303ff8594ad06d1865188d10972577c
Merge: 78b30a6 6d3705b
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Thu Oct 7 15:36:22 2010 +1000

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	cmake-fedora.spec
    	sources

 .gitignore        |    2 +-
 cmake-fedora.spec |   91 +++++++++++++++++++++++++++--------------------------
 sources           |    2 +-
 3 files changed, 48 insertions(+), 47 deletions(-)
---
diff --cc cmake-fedora.spec
index 95df5e7,4771f59..44e2859
--- a/cmake-fedora.spec
+++ b/cmake-fedora.spec
@@@ -5,66 -5,66 +5,67 @@@ Summary:    CMake helper modules for fe
  License:    BSD
  Group:      System Environment/Libraries
  URL:        http://git.fedorahosted.org/git/?p=cmake-fedora.git
- Source0:    https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-0.1.3-Source.tar.gz
+ Source0:    https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-0.1.4-Source.tar.gz
  
  BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
--BuildArch:  noarch
++    BuildArch:  noarch
  
--BuildRequires:  cmake >= 2.4
++    BuildRequires:  cmake >= 2.4
  
--Requires:   cmake >= 2.4
++    Requires:   cmake >= 2.4
  
--%description
--cmake-fedora consist a set of cmake modules that provides
--helper macros and targets for fedora developers.
++    %description
++    cmake-fedora consist a set of cmake modules that provides
++    helper macros and targets for fedora developers.
  
--%prep
--%setup -q -n %{name}-%{version}-Source
++    %prep
++    %setup -q -n %{name}-%{version}-Source
  
--%build
++    %build
  # $RPM_OPT_FLAGS should be  loaded from cmake macro.
--%cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo .
--%__make VERBOSE=1  %{?_smp_mflags}
++    %cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo .
++    %__make VERBOSE=1  %{?_smp_mflags}
  
--%install
--%__rm -rf $RPM_BUILD_ROOT
--%__make install DESTDIR=$RPM_BUILD_ROOT
++    %install
++    %__rm -rf $RPM_BUILD_ROOT
++    %__make install DESTDIR=$RPM_BUILD_ROOT
  # We install document using %doc
- (cd $RPM_BUILD_ROOT//usr/share/doc/cmake-fedora-0.1.3
-     %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING TODO
- )
 -(cd $RPM_BUILD_ROOT//usr/share/doc/cmake-fedora-0.1.4
 -    %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING TODO
 -)
++    (cd $RPM_BUILD_ROOT//usr/share/doc/cmake-fedora-0.1.4
++     %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING TODO
++    )
  
--%clean
--%__rm -rf $RPM_BUILD_ROOT
++    %clean
++    %__rm -rf $RPM_BUILD_ROOT
  
--%files
++    %files
  %defattr(-,root,root,-)
--%doc RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING TODO
++    %doc RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING TODO
  
--%{_datadir}/cmake/Modules/CMakeVersion.cmake
--%{_datadir}/cmake/Modules/CompileEnv.cmake
--%{_datadir}/cmake/Modules/DateTimeFormat.cmake
--%{_datadir}/cmake/Modules/ManageString.cmake
--%{_datadir}/cmake/Modules/ManageVariable.cmake
--%{_datadir}/cmake/Modules/ManageVersion.cmake
--%{_datadir}/cmake/Modules/PackRPM.cmake
--%{_datadir}/cmake/Modules/PackSource.cmake
--%{_datadir}/cmake/Modules/UseDoxygen.cmake
--%{_datadir}/cmake/Modules/UseFedpkg.cmake
--%{_datadir}/cmake/Modules/UseGConf.cmake
--%{_datadir}/cmake/Modules/UseGettext.cmake
--%{_datadir}/cmake/Modules/UseHostingService.cmake
--%{_datadir}/cmake/Modules/UseUninstall.cmake
--%{_datadir}/cmake/Modules/cmake_uninstall.cmake.in
++    %{_datadir}/cmake/Modules/CMakeVersion.cmake
++    %{_datadir}/cmake/Modules/CompileEnv.cmake
++    %{_datadir}/cmake/Modules/DateTimeFormat.cmake
++    %{_datadir}/cmake/Modules/ManageString.cmake
++    %{_datadir}/cmake/Modules/ManageVariable.cmake
++    %{_datadir}/cmake/Modules/ManageVersion.cmake
++    %{_datadir}/cmake/Modules/PackRPM.cmake
++    %{_datadir}/cmake/Modules/PackSource.cmake
++    %{_datadir}/cmake/Modules/UseDoxygen.cmake
++    %{_datadir}/cmake/Modules/UseFedpkg.cmake
++    %{_datadir}/cmake/Modules/UseGConf.cmake
++    %{_datadir}/cmake/Modules/UseGettext.cmake
++    %{_datadir}/cmake/Modules/UseHostingService.cmake
++    %{_datadir}/cmake/Modules/UseUninstall.cmake
++    %{_datadir}/cmake/Modules/cmake_uninstall.cmake.in
  
--%changelog
- * Thu Oct 07 2010 Ding-Yi Chen <dchen at redhat.com> - 0.1.3-1
- - Fixed error in UseFedpkg.
 -* Thu Oct 07 2010 Ding-Yi Chen <dchen at redhat.com> - 0.1.4-1
 -- Fixed error in UseFedpkg.
++    %changelog
++    * Thu Oct 07 2010 Ding-Yi Chen <dchen at redhat.com> - 0.1.4-1
++    - Fixed error in UseFedpkg.
  
--* Mon Oct 04 2010 Ding-Yi Chen <dchen at redhat.com> - 0.1.1-1
--- Added koji scratch build target.
--- Fixed changelog_update.
++    * Mon Oct 04 2010 Ding-Yi Chen <dchen at redhat.com> - 0.1.1-1
++    - Added koji scratch build target.
++    - Fixed changelog_update.
  
--* Mon Oct 04 2010 Ding-Yi Chen <dchen at redhat.com> - 0.1.0-1
++    * Mon Oct 04 2010 Ding-Yi Chen <dchen at redhat.com> - 0.1.0-1
  - Initial package.
  
++