OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   10-Aug-2007 11:23:43
  Branch: HEAD                             Handle: 2007081010234300

  Modified files:
    openpkg-src/shared-mime-info
                            shared-mime-info.patch shared-mime-info.spec

  Log:
    upgrading package: shared-mime-info 0.15 -> 0.22

  Summary:
    Revision    Changes     Path
    1.2         +19 -6      openpkg-src/shared-mime-info/shared-mime-info.patch
    1.7         +8  -7      openpkg-src/shared-mime-info/shared-mime-info.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/shared-mime-info/shared-mime-info.patch
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 shared-mime-info.patch
  --- openpkg-src/shared-mime-info/shared-mime-info.patch       5 Apr 2005 
19:05:43 -0000       1.1
  +++ openpkg-src/shared-mime-info/shared-mime-info.patch       10 Aug 2007 
09:23:43 -0000      1.2
  @@ -1,12 +1,25 @@
   Index: Makefile.in
  ---- Makefile.in.orig 2004-08-30 20:17:02 +0200
  -+++ Makefile.in      2005-04-05 20:46:53 +0200
  -@@ -308,7 +308,7 @@
  -     -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
  +--- Makefile.in.orig 2007-07-30 12:39:03 +0200
  ++++ Makefile.in      2007-08-10 11:10:33 +0200
  +@@ -275,7 +275,7 @@
  + 
  + CLEANFILES = freedesktop.org.xml po/stamp-it
  + DISTCLEANFILES = intltool-extract intltool-merge intltool-update
  +-pkgconfigdir = $(datadir)/pkgconfig
  ++pkgconfigdir = $(libdir)/pkgconfig
  + pkgconfig_DATA = shared-mime-info.pc
  + all: config.h
  +     $(MAKE) $(AM_MAKEFLAGS) all-recursive
  +@@ -362,10 +362,10 @@
  +     -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
  + test-subclassing$(EXEEXT): $(test_subclassing_OBJECTS) 
$(test_subclassing_DEPENDENCIES) 
  +     @rm -f test-subclassing$(EXEEXT)
  +-    $(test_subclassing_LINK) $(test_subclassing_OBJECTS) 
$(test_subclassing_LDADD) $(LIBS)
  ++    $(test_subclassing_LINK) $(test_subclassing_OBJECTS) 
$(test_subclassing_LDADD) $(LIBS) $(ALL_LIBS)
    update-mime-database$(EXEEXT): $(update_mime_database_OBJECTS) 
$(update_mime_database_DEPENDENCIES) 
        @rm -f update-mime-database$(EXEEXT)
  --    $(LINK) $(update_mime_database_LDFLAGS) $(update_mime_database_OBJECTS) 
$(update_mime_database_LDADD) $(LIBS)
  -+    $(LINK) $(update_mime_database_LDFLAGS) $(update_mime_database_OBJECTS) 
$(update_mime_database_LDADD) $(LIBS) $(ALL_LIBS)
  +-    $(update_mime_database_LINK) $(update_mime_database_OBJECTS) 
$(update_mime_database_LDADD) $(LIBS)
  ++    $(update_mime_database_LINK) $(update_mime_database_OBJECTS) 
$(update_mime_database_LDADD) $(LIBS) $(ALL_LIBS)
    
    mostlyclean-compile:
        -rm -f *.$(OBJEXT)
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/shared-mime-info/shared-mime-info.spec
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 shared-mime-info.spec
  --- openpkg-src/shared-mime-info/shared-mime-info.spec        1 Jan 2007 
17:41:46 -0000       1.6
  +++ openpkg-src/shared-mime-info/shared-mime-info.spec        10 Aug 2007 
09:23:43 -0000      1.7
  @@ -25,18 +25,18 @@
   #   package information
   Name:         shared-mime-info
   Summary:      Shared MIME Type Information XML Database
  -URL:          http://www.freedesktop.org/Standards/shared-mime-info-spec
  +URL:          http://freedesktop.org/wiki/Software/shared-mime-info
   Vendor:       Freedesktop Project
   Packager:     OpenPKG Foundation e.V.
   Distribution: OpenPKG Community
   Class:        EVAL
   Group:        Data
   License:      GPL
  -Version:      0.15
  -Release:      20061114
  +Version:      0.22
  +Release:      20070810
   
   #   list of sources
  -Source0:      
http://www.freedesktop.org/software/shared-mime-info/shared-mime-info-%{version}.tar.gz
  +Source0:      
http://people.freedesktop.org/~hadess/shared-mime-info-%{version}.tar.bz2
   Patch0:       shared-mime-info.patch
   
   #   build information
  @@ -56,8 +56,8 @@
   %track
       prog shared-mime-info = {
           version   = %{version}
  -        url       = http://www.freedesktop.org/software/shared-mime-info/
  -        regex     = shared-mime-info-(__VER__)\.tar\.gz
  +        url       = http://freedesktop.org/wiki/Software/shared-mime-info
  +        regex     = shared-mime-info-(__VER__)\.tar\.bz2
       }
   
   %prep
  @@ -70,7 +70,8 @@
       CPPFLAGS="%{l_cppflags}" \
       LDFLAGS="%{l_ldflags}" \
       ./configure \
  -        --prefix=%{l_prefix}
  +        --prefix=%{l_prefix} \
  +        --mandir=%{l_prefix}/man
       %{l_make} %{l_mflags -O}
   
   %install
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to