rpms/shared-desktop-ontologies/F-13 shared-desktop-ontologies-0.3-pkgconfig_fix_version.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 shared-desktop-ontologies.spec, 1.1, 1.2 sources, 1.2, 1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/shared-desktop-ontologies/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7114/F-13

Modified Files:
	.cvsignore shared-desktop-ontologies.spec sources 
Added Files:
	shared-desktop-ontologies-0.3-pkgconfig_fix_version.patch 
Log Message:
* Wed Mar 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.3-1
- 0.3


shared-desktop-ontologies-0.3-pkgconfig_fix_version.patch:
 shared-desktop-ontologies.pc.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE shared-desktop-ontologies-0.3-pkgconfig_fix_version.patch ---
diff -up shared-desktop-ontologies-0.3/shared-desktop-ontologies.pc.cmake.fix_version shared-desktop-ontologies-0.3/shared-desktop-ontologies.pc.cmake
--- shared-desktop-ontologies-0.3/shared-desktop-ontologies.pc.cmake.fix_version	2009-11-25 08:17:13.000000000 -0600
+++ shared-desktop-ontologies-0.3/shared-desktop-ontologies.pc.cmake	2010-03-10 14:40:27.317877892 -0600
@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
 
 Name: shared-desktop-ontologies
 Description: Common OSCAF desktop ontologies
-Version: @CMAKE_ONTOLOGIES_VERSION_STRING@
+Version: @SHAREDDESKTOPONTOLOGIES_VERSION@
 Requires:
 Libs:
 Cflags:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shared-desktop-ontologies/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Dec 2009 21:21:59 -0000	1.2
+++ .cvsignore	10 Mar 2010 20:48:21 -0000	1.3
@@ -1 +1 @@
-shared-desktop-ontologies-0.2.tar.bz2
+shared-desktop-ontologies-0.3.tar.bz2


Index: shared-desktop-ontologies.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-desktop-ontologies/F-13/shared-desktop-ontologies.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shared-desktop-ontologies.spec	9 Dec 2009 21:22:00 -0000	1.1
+++ shared-desktop-ontologies.spec	10 Mar 2010 20:48:21 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           shared-desktop-ontologies
-Version:        0.2
-Release:        3%{?dist}
+Version:        0.3
+Release:        1%{?dist}
 Summary:        Shared ontologies needed for semantic environments
 
 Group:          User Interface/Desktops
@@ -10,6 +10,9 @@ Source0:        http://downloads.sourcef
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+## upstreamable patches
+Patch50: shared-desktop-ontologies-0.3-pkgconfig_fix_version.patch
+
 BuildRequires:  cmake >= 2.6.0
 
 
@@ -38,6 +41,7 @@ web community in general.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
+Requires:       cmake
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
@@ -50,14 +54,21 @@ that use %{name}.
 %prep
 %setup -q
 
+%patch50 -p1 -b .pkgconfig_fix_version
+
 
 %build
-%cmake .
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -67,15 +78,18 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.BSD LICENSE.CC-BY README
-%{_datadir}/ontology
+%{_datadir}/ontology/
 
 %files devel
 %defattr(-,root,root,-)
-%{_datadir}/cmake/SharedDesktopOntologies
+%{_datadir}/cmake/SharedDesktopOntologies/
 %{_datadir}/pkgconfig/shared-desktop-ontologies.pc
 
 
 %changelog
+* Wed Mar 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.3-1
+- 0.3
+
 * Sun Dec  6 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 0.2-3
 - Add -devel package and move CMake and pkgconfig files there
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shared-desktop-ontologies/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Dec 2009 21:22:00 -0000	1.2
+++ sources	10 Mar 2010 20:48:21 -0000	1.3
@@ -1 +1 @@
-6c004e1c377f768cae5b321bc111876b  shared-desktop-ontologies-0.2.tar.bz2
+6c93fdd49f1ad4c0005d72a5306768b9  shared-desktop-ontologies-0.3.tar.bz2