From 7b3d3e824930d1802e74290e68fe70d3fb8e0993 Mon Sep 17 00:00:00 2001 From: codestation Date: Wed, 22 Jan 2014 17:15:18 -0430 Subject: [PATCH 1/3] Removed the *64 spec files. Now the same spec file works for both architectures. --- rpmbuild/VitaMTP.spec | 94 +++++++++++++++++++++++------------------ rpmbuild/VitaMTP64.spec | 68 ----------------------------- rpmbuild/qcma.spec | 39 +++++++++-------- rpmbuild/qcma64.spec | 42 ------------------ 4 files changed, 76 insertions(+), 167 deletions(-) delete mode 100644 rpmbuild/VitaMTP64.spec delete mode 100644 rpmbuild/qcma64.spec diff --git a/rpmbuild/VitaMTP.spec b/rpmbuild/VitaMTP.spec index 4a79706..cc969ec 100644 --- a/rpmbuild/VitaMTP.spec +++ b/rpmbuild/VitaMTP.spec @@ -2,67 +2,81 @@ # VitaMTP spec file # -Name: libvitamtp2 +Name: libvitamtp +Version: 2.5.0 +Release: 0 +%define sonum 3 Summary: Low-level Vita communication library License: GPL-3.0 -Release: 2 -Version: 2.1.0 +Group: System/Libraries URL: https://github.com/codestation/VitaMTP Source: https://github.com/codestation/VitaMTP.git -Prefix: /usr +BuildRequires: pkg-config +BuildRequires: libxml2-devel +BuildRequires: libusb-1_0-devel + +%description +libVitaMTP is a library based off of libMTP that does low level USB +communications with the Vita. It can read and receive MTP commands that +the Vita sends, which are a proprietary set of commands that is based on +the MTP open standard. + +%package -n %{name}%{sonum} +Summary: Low-level Vita communication library Group: System/Libraries +%description -n %{name}%{sonum} +libVitaMTP is a library based off of libMTP that does low level USB +communications with the Vita. It can read and receive MTP commands that +the Vita sends, which are a proprietary set of commands that is based on +the MTP open standard. + %package devel Summary: Low-level Vita communication library - development files Group: Development/Libraries/C and C++ -Requires: libvitamtp2 == 2.1.0 - -%description -libVitaMTP is a library based off of libMTP that does low level USB -communications with the Vita. It can read and receive MTP commands that -the Vita sends, which are a proprietary set of commands that is based on -the MTP open standard. +Requires: %{name}%{sonum} = %{version} +Requires: libxml2-devel +Requires: libusb-1_0-devel %description devel -libVitaMTP is a library based off of libMTP that does low level USB -communications with the Vita. It can read and receive MTP commands that -the Vita sends, which are a proprietary set of commands that is based on +libVitaMTP is a library based off of libMTP that does low level USB +communications with the Vita. It can read and receive MTP commands that +the Vita sends, which are a proprietary set of commands that is based on the MTP open standard. This package contains only the files necessary for development. -%changelog -* Tue Nov 05 2013 codestation - 2.1.0 -- Added new CMA version. - %prep -rm -rf $RPM_SOURCE_DIR/libvitamtp2 -git clone https://github.com/codestation/VitaMTP.git $RPM_SOURCE_DIR/libvitamtp2 -cp -r $RPM_SOURCE_DIR/libvitamtp2 $RPM_BUILD_DIR/libvitamtp2 -%setup -n libvitamtp2 -DT +rm -rf $RPM_SOURCE_DIR/%{name}%{sonum} +git clone https://github.com/codestation/VitaMTP.git $RPM_SOURCE_DIR/%{name}%{sonum} +cp -r $RPM_SOURCE_DIR/%{name}%{sonum} $RPM_BUILD_DIR/%{name}%{sonum} + +%setup -n %{name}%{sonum} -DT %build ./autogen.sh -./configure --prefix=/usr --disable-opencma -make +./configure --prefix=/usr --libdir=%{_libdir} +make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install -mkdir -p %{buildroot}/lib/udev/rules.d -cp debian/vitamtp1.udev %{buildroot}/lib/udev/rules.d/80-psvita.rules +%makeinstall +rm -rf %{buildroot}/%{_libdir}/*.la +mkdir -p %{buildroot}/usr/lib/udev/rules.d +cp debian/vitamtp1.udev %{buildroot}/usr/lib/udev/rules.d/80-psvita.rules -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post -n %{name}%{sonum} -p /sbin/ldconfig +%postun -n %{name}%{sonum} -p /sbin/ldconfig -%files -%defattr(-,root,root,-) -/lib/udev/rules.d/80-psvita.rules -/usr/lib/libvitamtp.la -/usr/lib/libvitamtp.so.2 -/usr/lib/libvitamtp.so.2.0.0 +%files -n %{name}%{sonum} +%defattr(-,root,root) +%doc README.md ChangeLog COPYING +%{_libdir}/lib*.so.* +%{_udevrulesdir}/80-psvita.rules %files devel -%defattr(-,root,root,-) -/usr/include/vitamtp.h -/usr/lib/libvitamtp.a -/usr/lib/libvitamtp.so -/usr/lib/pkgconfig/libvitamtp.pc \ No newline at end of file +%defattr(-,root,root) +%{_prefix}/include/vitamtp.h +%{_libdir}/libvitamtp.a +%{_libdir}/libvitamtp.so +%{_libdir}/pkgconfig/libvitamtp.pc + +%changelog diff --git a/rpmbuild/VitaMTP64.spec b/rpmbuild/VitaMTP64.spec deleted file mode 100644 index b149cbc..0000000 --- a/rpmbuild/VitaMTP64.spec +++ /dev/null @@ -1,68 +0,0 @@ -# -# VitaMTP spec file -# - -Name: libvitamtp2 -Summary: Low-level Vita communication library -License: GPL-3.0 -Release: 2 -Version: 2.1.0 -URL: https://github.com/codestation/VitaMTP -Source: https://github.com/codestation/VitaMTP.git -Prefix: /usr -Group: System/Libraries - -%package devel -Summary: Low-level Vita communication library - development files -Group: Development/Libraries/C and C++ -Requires: libvitamtp2 == 2.1.0 - -%description -libVitaMTP is a library based off of libMTP that does low level USB -communications with the Vita. It can read and receive MTP commands that -the Vita sends, which are a proprietary set of commands that is based on -the MTP open standard. - -%description devel -libVitaMTP is a library based off of libMTP that does low level USB -communications with the Vita. It can read and receive MTP commands that -the Vita sends, which are a proprietary set of commands that is based on -the MTP open standard. -This package contains only the files necessary for development. - -%changelog -* Tue Nov 05 2013 codestation - 2.1.0 -- Added new CMA version. - -%prep -rm -rf $RPM_SOURCE_DIR/libvitamtp2 -git clone https://github.com/codestation/VitaMTP.git $RPM_SOURCE_DIR/libvitamtp2 -cp -r $RPM_SOURCE_DIR/libvitamtp2 $RPM_BUILD_DIR/libvitamtp2 -%setup -n libvitamtp2 -DT - -%build -./autogen.sh -./configure --prefix=/usr --disable-opencma -make - -%install -make DESTDIR=%{buildroot} install -mkdir -p %{buildroot}/lib/udev/rules.d -cp debian/vitamtp1.udev %{buildroot}/lib/udev/rules.d/80-psvita.rules - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -/lib/udev/rules.d/80-psvita.rules -/usr/lib64/libvitamtp.la -/usr/lib64/libvitamtp.so.2 -/usr/lib64/libvitamtp.so.2.0.0 - -%files devel -%defattr(-,root,root,-) -/usr/include/vitamtp.h -/usr/lib64/libvitamtp.a -/usr/lib64/libvitamtp.so -/usr/lib64/pkgconfig/libvitamtp.pc \ No newline at end of file diff --git a/rpmbuild/qcma.spec b/rpmbuild/qcma.spec index 8ee0aea..87ac4c8 100644 --- a/rpmbuild/qcma.spec +++ b/rpmbuild/qcma.spec @@ -6,37 +6,42 @@ Name: qcma Summary: PSVita Content Manager Assistant License: GPL-3.0 Release: 1 -Version: 0.2.4 +Version: 0.2.9 URL: https://github.com/codestation/qcma Source: https://github.com/codestation/qcma.git -Prefix: /usr Group: Productivity/File utilities +Requires: ffmpeg +Requires: libqt5-qtbase +Requires: libvitamtp3 >= 2.5.0 +BuildRequires: pkg-config +BuildRequires: ffmpeg-devel +BuildRequires: libvitamtp-devel +BuildRequires: libqt5-qtbase-devel %description QCMA is an cross-platform application to provide a Open Source implementation of the original Content Manager Assistant that comes with the PS Vita. QCMA is meant to be compatible with Linux, Windows and MAC OS X. -%changelog -* Tue Nov 06 2013 codestation - 0.2.4 -- QCMA in WiFi mode is compatible with FW 3.00. - %prep -rm -rf $RPM_SOURCE_DIR/qcma -git clone https://github.com/codestation/qcma.git $RPM_SOURCE_DIR/qcma -cp -r $RPM_SOURCE_DIR/qcma $RPM_BUILD_DIR/qcma -%setup -n qcma -DT +rm -rf $RPM_SOURCE_DIR/%{name}-%{version} +git clone https://github.com/codestation/qcma.git $RPM_SOURCE_DIR/%{name}-%{version} +cp -r $RPM_SOURCE_DIR/%{name}-%{version} $RPM_BUILD_DIR/%{name}-%{version} + +%setup -n %{name}-%{version} -DT %build lrelease resources/translations/*.ts -qmake PREFIX=/usr -make +qmake-qt5 PREFIX=/usr +make %{?_smp_mflags} %install -make INSTALL_ROOT=%{buildroot} install +make install INSTALL_ROOT=%{buildroot} %files -%defattr(-,root,root,-) -/usr/bin/qcma -/usr/share/applications/qcma/qcma.desktop -/usr/share/icons/hicolor/64x64/apps/qcma.png \ No newline at end of file +%defattr(-,root,root) +%{_bindir}/qcma +%{_prefix}/share/applications/qcma/qcma.desktop +%{_prefix}/share/icons/hicolor/64x64/apps/qcma.png + +%changelog diff --git a/rpmbuild/qcma64.spec b/rpmbuild/qcma64.spec deleted file mode 100644 index 8ee0aea..0000000 --- a/rpmbuild/qcma64.spec +++ /dev/null @@ -1,42 +0,0 @@ -# -# qcma spec file -# - -Name: qcma -Summary: PSVita Content Manager Assistant -License: GPL-3.0 -Release: 1 -Version: 0.2.4 -URL: https://github.com/codestation/qcma -Source: https://github.com/codestation/qcma.git -Prefix: /usr -Group: Productivity/File utilities - -%description -QCMA is an cross-platform application to provide a Open Source implementation -of the original Content Manager Assistant that comes with the PS Vita. QCMA -is meant to be compatible with Linux, Windows and MAC OS X. - -%changelog -* Tue Nov 06 2013 codestation - 0.2.4 -- QCMA in WiFi mode is compatible with FW 3.00. - -%prep -rm -rf $RPM_SOURCE_DIR/qcma -git clone https://github.com/codestation/qcma.git $RPM_SOURCE_DIR/qcma -cp -r $RPM_SOURCE_DIR/qcma $RPM_BUILD_DIR/qcma -%setup -n qcma -DT - -%build -lrelease resources/translations/*.ts -qmake PREFIX=/usr -make - -%install -make INSTALL_ROOT=%{buildroot} install - -%files -%defattr(-,root,root,-) -/usr/bin/qcma -/usr/share/applications/qcma/qcma.desktop -/usr/share/icons/hicolor/64x64/apps/qcma.png \ No newline at end of file From c14d4e2df6b710e6945e979699a5678bb8ad633a Mon Sep 17 00:00:00 2001 From: codestation Date: Wed, 22 Jan 2014 19:17:19 -0430 Subject: [PATCH 2/3] Use lrelease from Qt5 and update build deps. --- rpmbuild/qcma.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpmbuild/qcma.spec b/rpmbuild/qcma.spec index 87ac4c8..a79e0b6 100644 --- a/rpmbuild/qcma.spec +++ b/rpmbuild/qcma.spec @@ -16,6 +16,7 @@ Requires: libvitamtp3 >= 2.5.0 BuildRequires: pkg-config BuildRequires: ffmpeg-devel BuildRequires: libvitamtp-devel +BuildRequires: libqt5-qttools BuildRequires: libqt5-qtbase-devel %description @@ -31,7 +32,7 @@ cp -r $RPM_SOURCE_DIR/%{name}-%{version} $RPM_BUILD_DIR/%{name}-%{version} %setup -n %{name}-%{version} -DT %build -lrelease resources/translations/*.ts +lrelease-qt5 resources/translations/*.ts qmake-qt5 PREFIX=/usr make %{?_smp_mflags} From 86e1282e04d8dc26fa1241dd11b2b71b0f4290d4 Mon Sep 17 00:00:00 2001 From: codestation Date: Thu, 23 Jan 2014 13:16:20 -0430 Subject: [PATCH 3/3] Create separate spec files for Fedora. --- rpmbuild/VitaMTP-fedora.spec | 82 +++++++++++++++++++ .../{VitaMTP.spec => VitaMTP-openSUSE.spec} | 0 rpmbuild/qcma-fedora.spec | 48 +++++++++++ rpmbuild/{qcma.spec => qcma-openSUSE.spec} | 0 4 files changed, 130 insertions(+) create mode 100644 rpmbuild/VitaMTP-fedora.spec rename rpmbuild/{VitaMTP.spec => VitaMTP-openSUSE.spec} (100%) create mode 100644 rpmbuild/qcma-fedora.spec rename rpmbuild/{qcma.spec => qcma-openSUSE.spec} (100%) diff --git a/rpmbuild/VitaMTP-fedora.spec b/rpmbuild/VitaMTP-fedora.spec new file mode 100644 index 0000000..4473983 --- /dev/null +++ b/rpmbuild/VitaMTP-fedora.spec @@ -0,0 +1,82 @@ +# +# VitaMTP spec file +# + +Name: libvitamtp +Version: 2.5.0 +Release: 0 +%define sonum 3 +Summary: Low-level Vita communication library +License: GPL-3.0 +Group: System/Libraries +URL: https://github.com/codestation/VitaMTP +Source: https://github.com/codestation/VitaMTP.git +BuildRequires: pkgconfig +BuildRequires: libxml2-devel +BuildRequires: libusbx-devel + +%description +libVitaMTP is a library based off of libMTP that does low level USB +communications with the Vita. It can read and receive MTP commands that +the Vita sends, which are a proprietary set of commands that is based on +the MTP open standard. + +%package -n %{name}%{sonum} +Summary: Low-level Vita communication library +Group: System/Libraries + +%description -n %{name}%{sonum} +libVitaMTP is a library based off of libMTP that does low level USB +communications with the Vita. It can read and receive MTP commands that +the Vita sends, which are a proprietary set of commands that is based on +the MTP open standard. + +%package devel +Summary: Low-level Vita communication library - development files +Group: Development/Libraries/C and C++ +Requires: %{name}%{sonum} = %{version} +Requires: libxml2-devel +Requires: libusbx-devel + +%description devel +libVitaMTP is a library based off of libMTP that does low level USB +communications with the Vita. It can read and receive MTP commands that +the Vita sends, which are a proprietary set of commands that is based on +the MTP open standard. +This package contains only the files necessary for development. + +%prep +rm -rf $RPM_SOURCE_DIR/%{name}%{sonum} +git clone https://github.com/codestation/VitaMTP.git $RPM_SOURCE_DIR/%{name}%{sonum} +cp -r $RPM_SOURCE_DIR/%{name}%{sonum} $RPM_BUILD_DIR/%{name}%{sonum} + +%setup -n %{name}%{sonum} -DT + +%build +./autogen.sh +./configure --prefix=/usr --libdir=%{_libdir} +make %{?_smp_mflags} + +%install +%makeinstall +rm -rf %{buildroot}/%{_libdir}/*.la +mkdir -p %{buildroot}/usr/lib/udev/rules.d +cp debian/vitamtp1.udev %{buildroot}/usr/lib/udev/rules.d/80-psvita.rules + +%post -n %{name}%{sonum} -p /sbin/ldconfig +%postun -n %{name}%{sonum} -p /sbin/ldconfig + +%files -n %{name}%{sonum} +%defattr(-,root,root) +%doc README.md ChangeLog COPYING +%{_libdir}/lib*.so.* +%{_udevrulesdir}/80-psvita.rules + +%files devel +%defattr(-,root,root) +%{_prefix}/include/vitamtp.h +%{_libdir}/libvitamtp.a +%{_libdir}/libvitamtp.so +%{_libdir}/pkgconfig/libvitamtp.pc + +%changelog diff --git a/rpmbuild/VitaMTP.spec b/rpmbuild/VitaMTP-openSUSE.spec similarity index 100% rename from rpmbuild/VitaMTP.spec rename to rpmbuild/VitaMTP-openSUSE.spec diff --git a/rpmbuild/qcma-fedora.spec b/rpmbuild/qcma-fedora.spec new file mode 100644 index 0000000..b5d658d --- /dev/null +++ b/rpmbuild/qcma-fedora.spec @@ -0,0 +1,48 @@ +# +# qcma spec file +# + +Name: qcma +Summary: PSVita Content Manager Assistant +License: GPL-3.0 +Release: 1 +Version: 0.2.9 +URL: https://github.com/codestation/qcma +Source: https://github.com/codestation/qcma.git +Group: Productivity/File utilities +Requires: ffmpeg +Requires: qt5-qtbase +Requires: libvitamtp3 >= 2.5.0 +BuildRequires: pkgconfig +BuildRequires: ffmpeg-devel +BuildRequires: libvitamtp-devel +BuildRequires: qt5-qttools-devel +BuildRequires: qt5-qtbase-devel + +%description +QCMA is an cross-platform application to provide a Open Source implementation +of the original Content Manager Assistant that comes with the PS Vita. QCMA +is meant to be compatible with Linux, Windows and MAC OS X. + +%prep +rm -rf $RPM_SOURCE_DIR/%{name}-%{version} +git clone https://github.com/codestation/qcma.git $RPM_SOURCE_DIR/%{name}-%{version} +cp -r $RPM_SOURCE_DIR/%{name}-%{version} $RPM_BUILD_DIR/%{name}-%{version} + +%setup -n %{name}-%{version} -DT + +%build +lrelease-qt5 resources/translations/*.ts +qmake-qt5 PREFIX=/usr +make %{?_smp_mflags} + +%install +make install INSTALL_ROOT=%{buildroot} + +%files +%defattr(-,root,root) +%{_bindir}/qcma +%{_prefix}/share/applications/qcma/qcma.desktop +%{_prefix}/share/icons/hicolor/64x64/apps/qcma.png + +%changelog diff --git a/rpmbuild/qcma.spec b/rpmbuild/qcma-openSUSE.spec similarity index 100% rename from rpmbuild/qcma.spec rename to rpmbuild/qcma-openSUSE.spec