first try

bareos · Aug 17, 2018 · a19f92f · a19f92f
1 parent 51f0091
commit a19f92f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/core/platforms/opsi/winbareos-opsi.spec b/core/platforms/opsi/winbareos-opsi.spec
@@ -47,8 +47,8 @@ VERSION32C=$(sed -r -e 's/(.{1,32}).*/\1/' -e 's/\.*$//' <<< %{version})
 sed -i -e "s/^version: \$PackageVersion/version: %{release}/i" \
        -e "s/^version: \$ProductVersion/version: $VERSION32C/i" opsi/OPSI/control
 
-WINBAREOS32=`ls -1 /winbareos*-postvista-32-bit-*.exe`
-WINBAREOS64=`ls -1 /winbareos*-postvista-64-bit-*.exe`
+WINBAREOS32=`ls -1 /winbareos*-32-bit-*.exe`
+WINBAREOS64=`ls -1 /winbareos*-64-bit-*.exe`
 if [ -r "$WINBAREOS32" ] && [ -r "$WINBAREOS64" ]; then
     mkdir -p opsi/CLIENT_DATA/data
     cp -a $WINBAREOS32 $WINBAREOS64 opsi/CLIENT_DATA/data

diff --git a/core/platforms/win32/mingw-debugsrc-devel.spec b/core/platforms/win32/mingw-debugsrc-devel.spec
@@ -27,8 +27,8 @@ Source0:        bareos-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Provides:       %name = %version
-Provides:       %name-postvista = %version
-Provides:       %name-postvista-debug = %version
+Provides:       %name-bareos = %version
+Provides:       %name-bareos-debug = %version
 #Provides:       %name-prevista = %version
 #Provides:       %name-prevista-debug = %version
 

diff --git a/core/platforms/win32/winbareos-nsi.spec b/core/platforms/win32/winbareos-nsi.spec
@@ -11,7 +11,7 @@
 # flavors:
 #   If name contains debug, enable debug during build.
 #   If name contains prevista, build for windows < vista.
-%define flavors postvista postvista-debug
+%define flavors bareos bareos-debug
 
 %define SIGNCERT %{_builddir}/ia.p12
 %define SIGNPWFILE %{_builddir}/signpassword
@@ -88,11 +88,11 @@ BuildRequires:  mingw64-libsqlite
 BuildRequires:  mingw32-libjansson
 BuildRequires:  mingw64-libjansson
 
-BuildRequires:  mingw32-winbareos-postvista = %{version}
-BuildRequires:  mingw64-winbareos-postvista = %{version}
+BuildRequires:  mingw32-winbareos-bareos = %{version}
+BuildRequires:  mingw64-winbareos-bareos = %{version}
 
-BuildRequires:  mingw32-winbareos-postvista-debug = %{version}
-BuildRequires:  mingw64-winbareos-postvista-debug = %{version}
+BuildRequires:  mingw32-winbareos-bareos-debug = %{version}
+BuildRequires:  mingw64-winbareos-bareos-debug = %{version}
 
 BuildRequires:  osslsigncode
 BuildRequires:  obs-name-resolution-settings

diff --git a/core/platforms/win32/winbareos32.spec b/core/platforms/win32/winbareos32.spec
@@ -15,7 +15,7 @@
 # flavors:
 #   If name contains debug, enable debug during build.
 #   If name contains prevista, build for windows < vista.
-%define flavors postvista postvista-debug
+%define flavors bareos bareos-debug
 %define dirs_with_unittests lib findlib
 %define bareos_configs bareos-dir.d/ bareos-fd.d/ bareos-sd.d/ tray-monitor.d/ bconsole.conf
 
@@ -82,14 +82,14 @@ BuildRequires:  cmake
 %description
 Base package for Bareos Windows build.
 
-%package postvista
+%package bareos
 Summary:        bareos
-%description postvista
+%description bareos
 Bareos for Windows versions >= Windows Vista
 
-%package postvista-debug
+%package bareos-debug
 Summary:        bareos
-%description postvista-debug
+%description bareos-debug
 Bareos Debug for Windows versions >= Windows Vista
 
 
@@ -111,7 +111,7 @@ done
 for flavor in %flavors; do
 
    WINDOWS_BITS=$(echo %name | grep 64 >/dev/null 2>&1 && echo "64" || echo "32")
-   WINDOWS_VERSION=$(echo $flavor | grep postvista >/dev/null && echo 0x600 || echo 0x500)
+   WINDOWS_VERSION=$(echo $flavor | grep bareos >/dev/null && echo 0x600 || echo 0x500)
    pushd $flavor
    %{_mingw32_cmake_qt4} \
       -DCMAKE_INSTALL_BINDIR:PATH=%{_mingw64_bindir} \
@@ -152,11 +152,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 
 
-%files postvista
+%files bareos
 %defattr(-,root,root)
-/postvista-%WINDOWS_BITS
+/bareos-%WINDOWS_BITS
 
-%files postvista-debug
-/postvista-debug-%WINDOWS_BITS
+%files bareos-debug
+/bareos-debug-%WINDOWS_BITS
 
 %changelog
diff --git a/core/platforms/win32/winbareos64.spec b/core/platforms/win32/winbareos64.spec
@@ -15,7 +15,7 @@
 # flavors:
 #   If name contains debug, enable debug during build.
 #   If name contains prevista, build for windows < vista.
-%define flavors postvista postvista-debug
+%define flavors bareos bareos-debug
 %define dirs_with_unittests lib findlib
 %define bareos_configs bareos-dir.d/ bareos-fd.d/ bareos-sd.d/ tray-monitor.d/ bconsole.conf
 
@@ -82,14 +82,14 @@ BuildRequires:  cmake
 %description
 Base package for Bareos Windows build.
 
-%package postvista
+%package bareos
 Summary:        bareos
-%description postvista
+%description bareos
 Bareos for Windows versions >= Windows Vista
 
-%package postvista-debug
+%package bareos-debug
 Summary:        bareos
-%description postvista-debug
+%description bareos-debug
 Bareos Debug for Windows versions >= Windows Vista
 
 
@@ -111,7 +111,7 @@ done
 for flavor in %flavors; do
 
    #WINDOWS_BITS=$(echo %name | grep 64 >/dev/null 2>&1 && echo "64" || echo "32")
-   WINDOWS_VERSION=$(echo $flavor | grep postvista >/dev/null && echo 0x600 || echo 0x500)
+   WINDOWS_VERSION=$(echo $flavor | grep bareos >/dev/null && echo 0x600 || echo 0x500)
    pushd $flavor
    %{_mingw64_cmake_qt4} \
       -DCMAKE_INSTALL_BINDIR:PATH=%{_mingw64_bindir} \
@@ -152,11 +152,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 
 
-%files postvista
+%files bareos
 %defattr(-,root,root)
-/postvista-%WINDOWS_BITS
+/bareos-%WINDOWS_BITS
 
-%files postvista-debug
-/postvista-debug-%WINDOWS_BITS
+%files bareos-debug
+/bareos-debug-%WINDOWS_BITS
 
 %changelog