Advertisement
david_david

diff vlc-qt

Apr 7th, 2014
158
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.96 KB | None | 0 0
  1. $ svn diff
  2. Index: vlc-qt.spec
  3. ===================================================================
  4. --- vlc-qt.spec (révision 612502)
  5. +++ vlc-qt.spec (copie de travail)
  6. @@ -1,10 +1,10 @@
  7. -Summary: A simple library to connect Qt application with libvlc
  8. Name: vlc-qt
  9. Version: 0.9.0
  10. Release: %mkrel 2
  11. +Summary: A simple library to connect Qt application with libvlc
  12. License: GPLv3+
  13. Group: System/Libraries
  14. -Url: http://projects.tano.si/
  15. +URL: http://projects.tano.si/
  16. # Generated by github https://github.com/ntadej/vlc-qt
  17. Source0: %{name}-%{version}.tar.gz
  18. Patch0: %{name}-%{version}-linkage.patch
  19. @@ -19,10 +19,10 @@
  20.  
  21. #----------------------------------------------------------------------------
  22.  
  23. -%define libvlcqt_major 0.9
  24. -%define libvlcqt %mklibname vlc-qt %{libvlcqt_major}
  25. +%define libvlcqt_major 0.9
  26. +%define libvlcqt %mklibname %{name} %{libvlcqt_major}
  27.  
  28. -%package -n %{libvlcqt}
  29. +%package -n %{libvlcqt}
  30. Summary: A simple library to connect Qt application with libvlc (core)
  31. Group: System/Libraries
  32.  
  33. @@ -34,17 +34,18 @@
  34. This package contains vlc-qt core library.
  35.  
  36. %files -n %{libvlcqt}
  37. -%{_libdir}/libvlc-qt.so.%{libvlcqt_major}*
  38. +%{_libdir}/libvlc-qt.so.%{libvlcqt_major}
  39. +%{_libdir}/libvlc-qt.so.%{libvlcqt_major}.*
  40.  
  41. #----------------------------------------------------------------------------
  42.  
  43. -%define devvlcqt %mklibname vlc-qt -d
  44. +%define devvlcqt %mklibname %{name} -d
  45.  
  46. -%package -n %{devvlcqt}
  47. +%package -n %{devvlcqt}
  48. Summary: Headers and development libraries for vlc-qt core library
  49. Group: Development/C++
  50. -Requires: %{libvlcqt} = %{version}
  51. -Provides: %{name}-devel = %{EVRD}
  52. +Requires: %{libvlcqt} = %{version}-%{release}
  53. +Provides: %{name}-devel = %{version}-%{release}
  54.  
  55. %description -n %{devvlcqt}
  56. Headers and development libraries for vlc-qt core library.
  57. @@ -53,27 +54,14 @@
  58. %doc AUTHORS CHANGELOG README.md LICENSE.GPL LICENSE.LGPL
  59. %{_libdir}/pkgconfig/libvlc-qt.pc
  60. %{_libdir}/libvlc-qt.so
  61. -%{_includedir}/%{name}/Audio.h
  62. -%{_includedir}/%{name}/Common.h
  63. -%{_includedir}/%{name}/Config.h
  64. -%{_includedir}/%{name}/Enums.h
  65. -%{_includedir}/%{name}/Error.h
  66. -%{_includedir}/%{name}/Instance.h
  67. -%{_includedir}/%{name}/Media.h
  68. -%{_includedir}/%{name}/MediaList.h
  69. -%{_includedir}/%{name}/MediaListPlayer.h
  70. -%{_includedir}/%{name}/MediaPlayer.h
  71. -%{_includedir}/%{name}/MetaManager.h
  72. -%{_includedir}/%{name}/SharedExportCore.h
  73. -%{_includedir}/%{name}/Video.h
  74. -%{_includedir}/%{name}/VideoDelegate.h
  75. -%{_includedir}/%{name}/VideoFrame.h
  76. -%{_includedir}/%{name}/VideoMemoryStream.h
  77. +%{_includedir}/%{name}/*.h
  78.  
  79. -%define libvlcqtwdt_major 0.9
  80. -%define libvlcqtwdt %mklibname vlc-qt-widgets %{libvlcqtwdt_major}
  81. +#----------------------------------------------------------------------------
  82.  
  83. -%package -n %{libvlcqtwdt}
  84. +%define libvlcqtwdt_major 0.9
  85. +%define libvlcqtwdt %mklibname %{name}-widgets %{libvlcqtwdt_major}
  86. +
  87. +%package -n %{libvlcqtwdt}
  88. Summary: A simple library to connect Qt application with libvlc (widgets)
  89. Group: System/Libraries
  90.  
  91. @@ -85,39 +73,35 @@
  92. This package contains vlc-qt widgets library.
  93.  
  94. %files -n %{libvlcqtwdt}
  95. -%{_libdir}/libvlc-qt-widgets.so.%{libvlcqtwdt_major}*
  96. +%{_libdir}/libvlc-qt-widgets.so.%{libvlcqtwdt_major}
  97. +%{_libdir}/libvlc-qt-widgets.so.%{libvlcqtwdt_major}.*
  98.  
  99. #----------------------------------------------------------------------------
  100.  
  101. -%define devvlcqtwdt %mklibname vlc-qt-widgets -d
  102. +%define devvlcqtwdt %mklibname %{name}-widgets -d
  103.  
  104. -%package -n %{devvlcqtwdt}
  105. +%package -n %{devvlcqtwdt}
  106. Summary: Headers and development libraries for vlc-qt widgets library
  107. Group: Development/C++
  108. -Requires: %{libvlcqt} = %{version}
  109. -Requires: %{libvlcqtwdt} = %{version}
  110. -Requires: %{devvlcqt} = %{version}
  111. -Provides: %{name}-widgets-devel = %{EVRD}
  112. +Requires: %{libvlcqt} = %{version}-%{release}
  113. +Requires: %{libvlcqtwdt} = %{version}-%{release}
  114. +Requires: %{devvlcqt} = %{version}-%{release}
  115. +Provides: %{name}-widgets-devel = %{version}-%{release}
  116.  
  117. %description -n %{devvlcqtwdt}
  118. Headers and development libraries for vlc-qt widgets library.
  119.  
  120. %files -n %{devvlcqtwdt}
  121. -#%{_libdir}/pkgconfig/libvlc-qt-widgets.pc
  122. %{_libdir}/libvlc-qt-widgets.so
  123. -%{_includedir}/%{name}/ControlAudio.h
  124. -%{_includedir}/%{name}/ControlVideo.h
  125. -%{_includedir}/%{name}/SharedExportWidgets.h
  126. -%{_includedir}/%{name}/WidgetSeek.h
  127. -%{_includedir}/%{name}/WidgetVideo.h
  128. -%{_includedir}/%{name}/WidgetVolumeSlider.h
  129. +%{_includedir}/%{name}/*.h
  130.  
  131. #----------------------------------------------------------------------------
  132.  
  133. %prep
  134. %setup -q
  135. -%patch0 -p1
  136.  
  137. +%apply_patches
  138. +
  139. %build
  140. %cmake \
  141. -DWITH_WIDGETS:BOOL=ON \
  142. @@ -127,5 +111,3 @@
  143.  
  144. %install
  145. %makeinstall_std -C build
  146. -
  147. -%changelog
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement