[meego-commits] 15247: Changes to Trunk/libsmack

[Peter Zhu]

Hi,
I have made the following changes to libsmack in project Trunk. Please review and accept ASAP.

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #15247:

  submit:   Trunk:Testing/libsmack(r2) -> Trunk/libsmack


Message:
    Move to Trunk

State:   new          2011-03-25T04:18:56 peter
Comment: None



changes files:
--------------
--- libsmack.changes
+++ libsmack.changes
@@ -0,0 +1,4 @@
+* Thu Mar 24 2011 Marko Saukko <marko.saukko at cybercom.com> - 2.0.0
+- Adding documentation package to libsmack to fix build issues where
+  some systems have doxygen and some not (BMC#14884).
+

spec files:
-----------
--- libsmack.spec
+++ libsmack.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.21
+# Generated by: spectacle version 0.22
 # 
 # >> macros
 # << macros
@@ -16,9 +16,10 @@
 Source100:  libsmack.yaml
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+BuildRequires:  pkgconfig(check)
 BuildRequires:  libattr-devel
 BuildRequires:  uthash-devel
-BuildRequires:  check-devel
+BuildRequires:  doxygen
 
 
 %description
@@ -32,7 +33,17 @@
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-Description: %{summary}
+Development headers for SMACK userland tools.
+
+
+%package docs
+Summary:    Documentation for SMACK userland tools
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description docs
+Documentation for SMACK userland tools.
+
 
 
 %prep
@@ -69,6 +80,9 @@
 
 
 
+
+
+
 %files
 %defattr(-,root,root,-)
 # >> files
@@ -84,3 +98,9 @@
 %{_includedir}/sys/smack.h
 # << files devel
 
+%files docs
+%defattr(-,root,root,-)
+# >> files docs
+%{_docdir}/libsmack/libsmack-doxygen-*.tar.gz
+# << files docs
+

other changes:
--------------

++++++ libsmack.yaml
--- libsmack.yaml
+++ libsmack.yaml
@@ -9,13 +9,21 @@
     - libsmack-%{version}.tar.bz2
 Description: |
     These are the userland libraries and tools for SMACK.
-
+PkgConfigBR:
+    - check
 PkgBR:
     - libattr-devel
     - uthash-devel
-    - check-devel
+    - doxygen
 Configure: reconfigure
 SubPackages:
     - Name: devel
       Summary: Development files for SMACK userland tools
       Group: Development/Libraries
+      Description: |
+          Development headers for SMACK userland tools.
+    - Name: docs
+      Summary: Documentation for SMACK userland tools
+      Group: Development/Libraries
+      Description: |
+          Documentation for SMACK userland tools.