Packman Build Service PMBS

Changes of Revision 10

libmp3splt.spec Changed

@@ -20,15 +20,19 @@
 Summary:        Library to split MP3 and Ogg Files
 Source:         http://prdownloads.sourceforge.net/mp3splt/libmp3splt-%{version}.tar.gz
 Source99:       libmp3splt-rpmlintrc
+Patch0:         %name.patch
 URL:            http://mp3splt.sourceforge.net/mp3splt_page/home.php
-Group:          System/Libraries
 License:        GPL-2.0+
-BuildRoot:      %{_tmppath}/build-%{name}-%{version}
-BuildRequires:  libogg-devel libvorbis-devel
-BuildRequires:  mad-devel libid3tag-devel zlib-devel
-BuildRequires:  pcre-devel
-BuildRequires:  gcc make glibc-devel pkgconfig
-BuildRequires:  autoconf automake libtool
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(id3tag)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(mad)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(zlib)
 Recommends:     %{name}%{soname}-mp3 = %{version}
 Recommends:     %{name}%{soname}-ogg = %{version}
 
@@ -39,7 +43,6 @@
 
 %package -n %{name}%{soname}
 Summary:        Library to split MP3 and Ogg Files
-Group:          System/Libraries
 Recommends:     %{name}-ogg = %{version}-%{release}
 Recommends:     %{name}-mp3 = %{version}-%{release}
 Obsoletes:      libmp3splt < %{version}
@@ -54,7 +57,6 @@
 
 %package -n %{name}%{soname}-mp3
 Summary:        MP3 Support Plugin for %{name}
-Group:          System/Libraries
 Requires:       %{name}%{soname} = %{version}-%{release}
 Obsoletes:      libmp3splt-mp3 < %{version}
 Provides:       libmp3splt-mp3 = %{version}
@@ -68,7 +70,6 @@
 
 %package -n %{name}%{soname}-ogg
 Summary:        Ogg Support Plugin for %{name}
-Group:          System/Libraries
 Requires:       %{name}%{soname} = %{version}-%{release}
 Obsoletes:      libmp3splt-ogg < %{version}
 Provides:       libmp3splt-ogg = %{version}
@@ -82,11 +83,13 @@
 
 %package -n libmp3splt-devel
 Summary:        Library to Split MP3 and Ogg Files
-Group:          Development/Libraries/C and C++
 Requires:       %{name}%{soname} = %{version}-%{release}
-Requires:       libogg-devel libvorbis-devel
-Requires:       mad-devel libid3tag-devel zlib-devel
-Requires:       pcre-devel pkgconfig
+Requires:       pkgconfig(id3tag)
+Requires:       pkgconfig(libpcre)
+Requires:       pkgconfig(mad)
+Requires:       pkgconfig(ogg)
+Requires:       pkgconfig(vorbis)
+Requires:       pkgconfig(zlib)
 
 %description -n libmp3splt-devel
 Library to split mp3 and ogg files selecting a begin and an end time position,
@@ -94,32 +97,28 @@
 files or to split entire albums to obtain original tracks.
 
 %prep
-%setup -q -n "libmp3splt-%{version}"
-#__sed -ri 's|^(VERSION *= *).*$|\1 %{version}|' po/Makevars
+%autosetup -p1 -n "libmp3splt-%{version}"
 
 %build
-export CFLAGS="%{optflags} -fno-strict-aliasing"
-export CPPFLAGS="$CFLAGS"
-export CXXFLAGS="$CFLAGS"
-
+export CFLAGS='%optflags -fno-strict-aliasing -std=gnu99'
  -e ./configure  || NOCONFIGURE=1 ./autogen.sh
 
 %configure \
     --disable-doxygen_doc \
 
-%__make %{?_smp_flags}
+%make_build
 
 %install
-%makeinstall
+%make_install
 
-%__rm -f "%{buildroot}%{_libdir}/libmp3splt".{a,la}
+rm -fv "%{buildroot}%{_libdir}/libmp3splt".{a,la}
 
-%__rm "%{buildroot}%{_libdir}/libmp3splt%{soname}"/*.a
-%__rm "%{buildroot}%{_libdir}/libmp3splt%{soname}"/*.la
+rm -fv "%{buildroot}%{_libdir}/libmp3splt%{soname}"/*.a
+rm -fv "%{buildroot}%{_libdir}/libmp3splt%{soname}"/*.la
 
 pushd "%{buildroot}%{_datadir}/locale"
-%__mv fr_FR fr
-%__mv de_DE de
+mv fr_FR fr
+mv de_DE de
 popd
 
 %find_lang "libmp3splt%{soname}"
@@ -127,26 +126,20 @@
 %post   -n libmp3splt%{soname} -p /sbin/ldconfig
 %postun -n libmp3splt%{soname} -p /sbin/ldconfig
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
 %files -n %{name}%{soname} -f libmp3splt%{soname}.lang
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog README
+%license COPYING
 %{_libdir}/libmp3splt.so.%{soname}
 %{_libdir}/libmp3splt.so.%{soname}.*
 %dir %{_libdir}/libmp3splt%{soname}
 
 %files -n %{name}%{soname}-mp3
-%defattr(-,root,root)
 %{_libdir}/libmp3splt%{soname}/libsplt_mp3.so*
 
 %files -n %{name}%{soname}-ogg
-%defattr(-,root,root)
 %{_libdir}/libmp3splt%{soname}/libsplt_ogg.so*
 
 %files -n libmp3splt-devel
-%defattr(-,root,root)
 %{_includedir}/libmp3splt
 %{_libdir}/libmp3splt.so
 %{_libdir}/pkgconfig/libmp3splt.pc

libmp3splt.patch Added

@@ -0,0 +1,129 @@
+---
+ plugins/mp3.c      |    6 ++++--
+ src/freedb.c       |    6 +++---
+ src/mp3splt.c      |   15 ++++-----------
+ src/string_utils.c |    4 ++--
+ src/tags_utils.c   |    2 +-
+ 5 files changed, 14 insertions(+), 19 deletions(-)
+
+--- a/plugins/mp3.c
++++ b/plugins/mp3.c
+@@ -1301,8 +1301,10 @@ static splt_mp3_state *splt_mp3_info(FIL
+         //Handle misplaced Xing header in mp3 files with CRC
+         else 
+         {
+-          if (xing_word == ((SPLT_MP3_XING_MAGIC << 16) & 0xffffffffL) 
+-              || xing_word == ((SPLT_MP3_INFO_MAGIC << 16) & 0xffffffffL))
++          unsigned long x = SPLT_MP3_XING_MAGIC;
++          unsigned long i = SPLT_MP3_INFO_MAGIC;
++          if (xing_word == ((x << 16) & 0xffffffffL)
++              || xing_word == ((i << 16) & 0xffffffffL))
+           {
+             ptr = start;
+             mad_bit_skip(&ptr, 16);
+--- a/src/freedb.c
++++ b/src/freedb.c
+@@ -75,7 +75,7 @@ char *get_cgi_path_and_cut_server(int ty
+   return cgi_path;
+ }
+ 
+-static char *splt_freedb_get_server(const char search_server256)
++static char *splt_freedb_get_server(const char *search_server)
+ {
+   char *server = NULL;
+ 
+@@ -155,7 +155,7 @@ the default which currently means freedb
+ 80). 
+ */
+ int splt_freedb_process_search(splt_state *state, char *search,
+-    int search_type, const char search_server256,
++    int search_type, const char *search_server,
+     int port_number)
+ {
+   int error = SPLT_FREEDB_OK;
+@@ -318,7 +318,7 @@ uses
+ \todo see when we don't have a valid port or get_type
+ */
+ char *splt_freedb_get_file(splt_state *state, int disc_id, int *error,
+-    int get_type, const char cddb_get_server256, int port_number)
++    int get_type, const char *cddb_get_server, int port_number)
+ {
+   int err = SPLT_FREEDB_FILE_OK;
+   *error = err;
+--- a/src/mp3splt.c
++++ b/src/mp3splt.c
+@@ -502,12 +502,7 @@ int mp3splt_progress_get_type(const splt
+ 
+ char *mp3splt_progress_get_filename_shorted(const splt_progress *p_bar)
+ {
+-  if (p_bar->filename_shorted)
+-  {
+     return strdup(p_bar->filename_shorted);
+-  }
+-
+-  return NULL;
+ }
+ 
+ int mp3splt_progress_get_current_split(const splt_progress *p_bar)
+@@ -1481,7 +1476,7 @@ splt_freedb_results *mp3splt_get_freedb_
+     const char *search_string,
+     splt_code *error,
+     int search_type,
+-    const char search_server256,
++    const char *search_server,
+     int port)
+ {
+   int erro = SPLT_OK;
+@@ -1580,7 +1575,7 @@ use.
+ */
+ splt_code mp3splt_write_freedb_file_result(splt_state *state, int disc_id,
+     const char *cddb_file, int cddb_get_type,
+-    const char cddb_get_server256, int port)
++    const char *cddb_get_server, int port)
+ {
+   int erro = SPLT_OK;
+   int *err = &erro;
+@@ -1958,16 +1953,14 @@ char **mp3splt_find_filenames(splt_state
+           }
+ 
+           int fname_size = strlen(filename) + 1;
+-          found_files0 = malloc(sizeof(char) * fname_size);
+-          memset(found_files0, '\0', fname_size);
+-
++          found_files0 = malloc(fname_size);
+           if (!found_files0)
+           {
+             free(found_files);
+             return NULL;
+           }
+ 
+-          strncat(found_files0, filename, fname_size);
++          memcpy(found_files0, filename, fname_size);
+           *num_of_files_found = 1;
+         }
+       }
+--- a/src/string_utils.c
++++ b/src/string_utils.c
+@@ -108,9 +108,9 @@ error:
+   return NULL;
+ }
+ 
+-splt_code splt_su_append_str(char **str, const char *to_append, ...)
++int splt_su_append_str(char **str, const char *to_append, ...)
+ {
+-  splt_code err = SPLT_OK;
++  int err = SPLT_OK;
+   va_list ap;
+ 
+   va_start(ap, to_append);
+--- a/src/tags_utils.c
++++ b/src/tags_utils.c
+@@ -72,7 +72,7 @@ static splt_tags *splt_tu_duplicate_tags
+     if (*error < 0)
+     {
+       int j = 0;
+-      for (j = 0; i < i; j++) { splt_tu_free_one_tags_content(&tagsi); }
++      for (j = 0; j < i; j++) { splt_tu_free_one_tags_content(&tagsi); }
+       *tags_number = 0;
+       return NULL;
+     }