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

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/shared-desktop-ontologies/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27837

Modified Files:
	.cvsignore shared-desktop-ontologies.spec sources 
Added Files:
	shared-desktop-ontologies-0.4-pkgconfig.patch 
Removed Files:
	shared-desktop-ontologies-0.3-pkgconfig_fix_version.patch 
Log Message:
* Thu May 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.4-1
- 0.4


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

--- NEW FILE shared-desktop-ontologies-0.4-pkgconfig.patch ---
diff -up shared-desktop-ontologies-0.4/shared-desktop-ontologies.pc.cmake.pkgconfig shared-desktop-ontologies-0.4/shared-desktop-ontologies.pc.cmake
--- shared-desktop-ontologies-0.4/shared-desktop-ontologies.pc.cmake.pkgconfig	2009-11-25 08:17:13.000000000 -0600
+++ shared-desktop-ontologies-0.4/shared-desktop-ontologies.pc.cmake	2010-05-06 07:56:38.396156575 -0500
@@ -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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Mar 2010 20:48:21 -0000	1.3
+++ .cvsignore	7 May 2010 04:05:33 -0000	1.4
@@ -1 +1 @@
-shared-desktop-ontologies-0.3.tar.bz2
+shared-desktop-ontologies-0.4.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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- shared-desktop-ontologies.spec	10 Mar 2010 20:48:21 -0000	1.2
+++ shared-desktop-ontologies.spec	7 May 2010 04:05:34 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           shared-desktop-ontologies
-Version:        0.3
+Version:        0.4
 Release:        1%{?dist}
 Summary:        Shared ontologies needed for semantic environments
 
@@ -11,9 +11,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 
 ## upstreamable patches
-Patch50: shared-desktop-ontologies-0.3-pkgconfig_fix_version.patch
+Patch50: shared-desktop-ontologies-0.4-pkgconfig.patch
 
 BuildRequires:  cmake >= 2.6.0
+BuildRequires:  pkgconfig
 
 
 %description
@@ -43,18 +44,16 @@ Summary:        Development files for %{
 Group:          Development/Libraries
 Requires:       cmake
 Requires:       %{name} = %{version}-%{release}
-
 %description    devel
 The %{name}-devel package contains libraries
 and header files for developing applications
 that use %{name}.
 
 
-
 %prep
 %setup -q
 
-%patch50 -p1 -b .pkgconfig_fix_version
+%patch50 -p1 -b .pkgconfig
 
 
 %build
@@ -71,6 +70,12 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
+%check
+# verify pkg-config version (notoriously wrong in recent releases)
+export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig
+test "$(pkg-config --modversion shared-desktop-ontologies)" = "%{version}.0"
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -87,6 +92,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu May 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.4-1
+- 0.4
+
+* Wed Apr 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.3-2
+- %%check: verify pkg-config --modversion sanity
+
 * Wed Mar 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.3-1
 - 0.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shared-desktop-ontologies/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Mar 2010 20:48:21 -0000	1.3
+++ sources	7 May 2010 04:05:34 -0000	1.4
@@ -1 +1 @@
-6c93fdd49f1ad4c0005d72a5306768b9  shared-desktop-ontologies-0.3.tar.bz2
+fa3b458501f08de178a35aaf82346e4f  shared-desktop-ontologies-0.4.tar.bz2


--- shared-desktop-ontologies-0.3-pkgconfig_fix_version.patch DELETED ---