[meego-commits] 6776: Changes to Trunk/libogg

[Peter Zhu]

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

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #6776:

  submit:   Trunk:Testing/libogg(r5) -> Trunk/libogg


Message:
    Move to Trunk

State:   new          2010-08-17T20:40:49 peter
Comment: None



changes files:
--------------
--- libogg.changes
+++ libogg.changes
@@ -0,0 +1,3 @@
+* Wed Aug 11 2010 Ling Yue <ling.yue at intel.com> - 1.2.0
+- Upgrade to 1.2.0
+

old:
----
  libogg-1.1.4.tar.gz

new:
----
  libogg-1.2.0.tar.gz

spec files:
-----------
--- libogg.spec
+++ libogg.spec
@@ -1,13 +1,13 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.13
+# spectacle version 0.18
 # 
 # >> macros
 # << macros
 
 Name:       libogg
 Summary:    The Ogg bitstream file format library
-Version:    1.1.4
+Version:    1.2.0
 Release:    1
 Group:      System/Libraries
 License:    BSD
@@ -17,10 +17,12 @@
 Requires(post):  /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
-Description: %{summary}
+Libogg is a library for manipulating Ogg bitstream file formats.
+Libogg supports both making Ogg bitstreams and getting packets from
+Ogg bitstreams.
+
 
 
 %package devel
@@ -29,7 +31,10 @@
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-Description: %{summary}
+Libogg is a library used for manipulating Ogg bitstreams. The
+libogg-devel package contains the header files and documentation
+needed for development using libogg.
+
 
 %package doc
 Summary:    Documentation for the Ogg runtime library
@@ -37,7 +42,8 @@
 Requires:   %{name} = %{version}-%{release}
 
 %description doc
-Description: %{summary}
+Documentation for developing applications with libogg
+
 
 
 %prep
@@ -51,7 +57,6 @@
 # << build pre
 
 %configure --disable-static
-# Call make instruction with smp support
 make %{?jobs:-j%jobs}
 
 # >> build post
@@ -64,10 +69,13 @@
 
 # >> install post
 chmod -x doc/*.html 
-# << install post
+rm -rf __installed_docs
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} __installed_docs
 
-%clean
-rm -rf %{buildroot}
+# rename directory to match index.html
+mv __installed_docs/ogg __installed_docs/libogg
+
+# << install post
 
 
 
@@ -78,6 +86,10 @@
 
 
 
+
+
+
+
 %files
 %defattr(-,root,root,-)
 # >> files
@@ -102,8 +114,6 @@
 %files doc
 %defattr(-,root,root,-)
 # >> files doc
-%doc doc/*.html
-%doc doc/*.txt
-%doc doc/*.png
+%doc __installed_docs/*
 # << files doc
 

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

++++++ libogg-1.1.4.tar.gz -> libogg-1.2.0.tar.gz
66454 lines of diff (skipped)

++++++ libogg.yaml
--- libogg.yaml
+++ libogg.yaml
@@ -1,19 +1,29 @@
 Name: libogg
 Summary: The Ogg bitstream file format library
-Version: 1.1.4
+Version: 1.2.0
 Release: 1
 Group: System/Libraries
 License: BSD
 URL: http://www.xiph.org/
 Sources:
     - http://downloads.xiph.org/releases/ogg/%{name}-%{version}.tar.gz
+Description: |
+    Libogg is a library for manipulating Ogg bitstream file formats.
+    Libogg supports both making Ogg bitstreams and getting packets from
+    Ogg bitstreams.
 
 SubPackages:
     - Name: devel
       Summary: Files needed for development using libogg
       Group: Development/Libraries
+      Description: |
+          Libogg is a library used for manipulating Ogg bitstreams. The
+          libogg-devel package contains the header files and documentation
+          needed for development using libogg.
 
     - Name: doc
       Summary: Documentation for the Ogg runtime library
       Group: Documentation
+      Description: |
+          Documentation for developing applications with libogg